Skip to content

Commit

Permalink
Unrolled build for rust-lang#119232
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#119232 - Takashiidobe:fix-doc-typos, r=JohnTitor

Fix doc typos

This PR fixes some typos I found while trawling through the rust source.
  • Loading branch information
rust-timer authored Dec 23, 2023
2 parents edcbcc7 + 9a2d890 commit 7d2becd
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ The target intends to match the corresponding Clang target for its `"C"` ABI.
## Platform requirements

The runtime should support the same set of APIs as any other supported wasi target for interacting with the host environment through the WASI standard. The runtime also should have implemetation of [wasi-threads proposal](https://github.com/WebAssembly/wasi-threads).
The runtime should support the same set of APIs as any other supported wasi target for interacting with the host environment through the WASI standard. The runtime also should have implementation of [wasi-threads proposal](https://github.com/WebAssembly/wasi-threads).

This target is not a stable target. This means that there are a few engines
which implement the `wasi-threads` feature and if they do they're likely behind a
Expand Down
4 changes: 2 additions & 2 deletions src/doc/rustdoc/src/lints.md
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,9 @@ warning: 1 warning emitted

## `redundant_explicit_links`

This lint is **warned by default**. It detects explicit links that are same
This lint is **warn-by-default**. It detects explicit links that are the same
as computed automatic links.
This usually means the explicit links is removeable. For example:
This usually means the explicit links are removeable. For example:

```rust
#![warn(rustdoc::redundant_explicit_links)] // note: unnecessary - warns by default.
Expand Down
2 changes: 1 addition & 1 deletion src/doc/unstable-book/src/compiler-flags/check-cfg.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ fn poke_platypus() {}
fn tame_lion() {}

// This is UNEXPECTED, because 'windows' is a well known condition name,
// and because 'windows' doens't take any values,
// and because 'windows' doesn't take any values,
// and will cause a compiler warning (by default).
#[cfg(windows = "unix")]
fn tame_windows() {}
Expand Down
4 changes: 2 additions & 2 deletions src/librustdoc/lint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ declare_rustdoc_lint! {
}

declare_rustdoc_lint! {
/// This lint is **warned by default**. It detects explicit links that are same
/// as computed automatic links. This usually means the explicit links is removeable.
/// This lint is **warn-by-default**. It detects explicit links that are the same
/// as computed automatic links. This usually means the explicit links are removeable.
/// This is a `rustdoc` only lint, see the documentation in the [rustdoc book].
///
/// [rustdoc book]: ../../../rustdoc/lints.html#redundant_explicit_links
Expand Down
2 changes: 1 addition & 1 deletion src/tools/tidy/src/style.rs
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ pub fn check(path: &Path, bad: &mut bool) {
let mut err = |_| {
tidy_error!(bad, "{}: leading newline", file.display());
};
suppressible_tidy_err!(err, skip_leading_newlines, "mising leading newline");
suppressible_tidy_err!(err, skip_leading_newlines, "missing leading newline");
}
let mut err = |msg: &str| {
tidy_error!(bad, "{}: {}", file.display(), msg);
Expand Down

0 comments on commit 7d2becd

Please sign in to comment.