diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-03-15 17:15:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-15 17:15:53 +0100 |
| commit | 277802e99ac5592726435438493398b94c7fe3ab (patch) | |
| tree | e7accaae4904790bfea5d6314467f0e0ebd45b35 /src | |
| parent | e755f2c7cdf8636f53243f2fdaffab2a87c5a3c5 (diff) | |
| parent | 13e889986d3f37014b4f8c3e892457831cb5d03b (diff) | |
| download | rust-277802e99ac5592726435438493398b94c7fe3ab.tar.gz rust-277802e99ac5592726435438493398b94c7fe3ab.zip | |
Rollup merge of #94947 - Dylan-DPC:fix/typos, r=oli-obk
fix typos Rework of #94603 which got closed as I was trying to unmerge and repush. This is a subset of changes from the original pr as I sed'd whatever typos I remembered from the original PR thanks to `@cuishuang` for the original PR
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/builder.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/passes/collect_intra_doc_links.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/visit_ast.rs | 2 | ||||
| -rw-r--r-- | src/test/rustdoc-ui/display-output.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/lint/cli-lint-override.rs | 2 | ||||
| -rw-r--r-- | src/tools/clippy/.github/ISSUE_TEMPLATE/ice.yml | 2 | ||||
| -rw-r--r-- | src/tools/clippy/clippy_lints/src/upper_case_acronyms.rs | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 0232446b1f7..7846c6db898 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1795,7 +1795,7 @@ impl Rustflags { } /// By default, cargo will pick up on various variables in the environment. However, bootstrap - /// reuses those variables to pass additional flags to rustdoc, so by default they get overriden. + /// reuses those variables to pass additional flags to rustdoc, so by default they get overridden. /// Explicitly add back any previous value in the environment. /// /// `prefix` is usually `RUSTFLAGS` or `RUSTDOCFLAGS`. diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs index 64c0ae32aad..3d8a62d50e0 100644 --- a/src/librustdoc/passes/collect_intra_doc_links.rs +++ b/src/librustdoc/passes/collect_intra_doc_links.rs @@ -948,7 +948,7 @@ fn resolve_associated_trait_item<'a>( /// /// This function returns `None` if no associated item was found in the impl. /// This can occur when the trait associated item has a default value that is -/// not overriden in the impl. +/// not overridden in the impl. /// /// This is just a wrapper around [`TyCtxt::impl_item_implementor_ids()`] and /// [`TyCtxt::associated_item()`] (with some helpful logging added). diff --git a/src/librustdoc/visit_ast.rs b/src/librustdoc/visit_ast.rs index 1693034db0e..e793ee75fd2 100644 --- a/src/librustdoc/visit_ast.rs +++ b/src/librustdoc/visit_ast.rs @@ -326,7 +326,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> { om.items.push((item, renamed)) } hir::ItemKind::Macro(ref macro_def, _) => { - // `#[macro_export] macro_rules!` items are handled seperately in `visit()`, + // `#[macro_export] macro_rules!` items are handled separately in `visit()`, // above, since they need to be documented at the module top level. Accordingly, // we only want to handle macros if one of three conditions holds: // diff --git a/src/test/rustdoc-ui/display-output.rs b/src/test/rustdoc-ui/display-output.rs index c40d99c9d4c..ec27a9f6ba3 100644 --- a/src/test/rustdoc-ui/display-output.rs +++ b/src/test/rustdoc-ui/display-output.rs @@ -1,4 +1,4 @@ -// Test that `--show-output` has an effect and `allow(unused)` can be overriden. +// Test that `--show-output` has an effect and `allow(unused)` can be overridden. // check-pass // edition:2018 diff --git a/src/test/ui/lint/cli-lint-override.rs b/src/test/ui/lint/cli-lint-override.rs index 7d762b05c97..a0e853fc384 100644 --- a/src/test/ui/lint/cli-lint-override.rs +++ b/src/test/ui/lint/cli-lint-override.rs @@ -1,5 +1,5 @@ // Tests that subsequent lints specified via the command line override -// each other, except for ForceWarn and Forbid, which cannot be overriden. +// each other, except for ForceWarn and Forbid, which cannot be overridden. // // revisions: warn_deny forbid_warn force_warn_deny // diff --git a/src/tools/clippy/.github/ISSUE_TEMPLATE/ice.yml b/src/tools/clippy/.github/ISSUE_TEMPLATE/ice.yml index 2a5b8b3c891..81bd9c5e032 100644 --- a/src/tools/clippy/.github/ISSUE_TEMPLATE/ice.yml +++ b/src/tools/clippy/.github/ISSUE_TEMPLATE/ice.yml @@ -10,7 +10,7 @@ body: attributes: label: Summary description: | - If possible, try to provide a minimal verifiable example. You can read ["Rust Bug Minimization Patterns"][mve] for how to create smaller examples. Otherwise, provide the crate where the ICE occured. + If possible, try to provide a minimal verifiable example. You can read ["Rust Bug Minimization Patterns"][mve] for how to create smaller examples. Otherwise, provide the crate where the ICE occurred. [mve]: http://blog.pnkfx.org/blog/2019/11/18/rust-bug-minimization-patterns/ validations: diff --git a/src/tools/clippy/clippy_lints/src/upper_case_acronyms.rs b/src/tools/clippy/clippy_lints/src/upper_case_acronyms.rs index 7286d0a7bf9..02bf09ed506 100644 --- a/src/tools/clippy/clippy_lints/src/upper_case_acronyms.rs +++ b/src/tools/clippy/clippy_lints/src/upper_case_acronyms.rs @@ -114,7 +114,7 @@ impl LateLintPass<'_> for UpperCaseAcronyms { check_ident(cx, &it.ident, self.upper_case_acronyms_aggressive); }, ItemKind::Enum(ref enumdef, _) => { - // check enum variants seperately because again we only want to lint on private enums and + // check enum variants separately because again we only want to lint on private enums and // the fn check_variant does not know about the vis of the enum of its variants enumdef .variants |
