about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-04-25 13:02:08 +0000
committerbors <bors@rust-lang.org>2024-04-25 13:02:08 +0000
commit6a9758d4f38d4763bd437c48fa7e5246cecf8d04 (patch)
tree99088b1595ad1298d675f75bffd455c194742159
parent1c84675e1f5bd97307af5a86b4f8e6d9e571362c (diff)
parent45df09b7deaeda5a816d9e447e5cca7b928b60c6 (diff)
Auto merge of #124058 - TechVest:master, r=fmease
Fix some typos in comments
-rw-r--r--compiler/rustc_hir_analysis/src/collect.rs2
-rw-r--r--src/bootstrap/src/core/build_steps/compile.rs2
-rw-r--r--src/librustdoc/passes/collect_intra_doc_links.rs2
-rw-r--r--tests/ui/lto/issue-105637.rs4
4 files changed, 5 insertions, 5 deletions
diff --git a/compiler/rustc_hir_analysis/src/collect.rs b/compiler/rustc_hir_analysis/src/collect.rs
index 1085caa310b..599f25147ce 100644
--- a/compiler/rustc_hir_analysis/src/collect.rs
+++ b/compiler/rustc_hir_analysis/src/collect.rs
@@ -992,7 +992,7 @@ fn lower_variant(
         .inspect(|f| {
             has_unnamed_fields |= f.ident.name == kw::Underscore;
             // We only check named ADT here because anonymous ADTs are checked inside
-            // the nammed ADT in which they are defined.
+            // the named ADT in which they are defined.
             if !is_anonymous {
                 field_uniqueness_check_ctx.check_field(f);
             }
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
index c20653b5dfa..1d46a158f9e 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
@@ -43,7 +43,7 @@ pub struct Std {
     /// This shouldn't be used from other steps; see the comment on [`Rustc`].
     crates: Vec<String>,
     /// When using download-rustc, we need to use a new build of `std` for running unit tests of Std itself,
-    /// but we need to use the downloaded copy of std for linking to rustdoc. Allow this to be overriden by `builder.ensure` from other steps.
+    /// but we need to use the downloaded copy of std for linking to rustdoc. Allow this to be overridden by `builder.ensure` from other steps.
     force_recompile: bool,
     extra_rust_args: &'static [&'static str],
     is_for_mir_opt_tests: bool,
diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
index 1ba4e6cbdf0..747f5c0a835 100644
--- a/src/librustdoc/passes/collect_intra_doc_links.rs
+++ b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -1420,7 +1420,7 @@ impl LinkCollector<'_, '_> {
         //
         // Otherwise, check if 2 links are same, if so, skip the resolve process.
         //
-        // Notice that this algorithm is passive, might possibly miss actual redudant cases.
+        // Notice that this algorithm is passive, might possibly miss actual redundant cases.
         let explicit_link = explicit_link.to_string();
         let display_text = ori_link.display_text.as_ref().unwrap();
 
diff --git a/tests/ui/lto/issue-105637.rs b/tests/ui/lto/issue-105637.rs
index 2cc70964b4c..884cd5d5e0e 100644
--- a/tests/ui/lto/issue-105637.rs
+++ b/tests/ui/lto/issue-105637.rs
@@ -3,8 +3,8 @@
 //
 // That manifested as both `rustc_driver` and rustc's "main" (`compiler/rustc`) having their own
 // `std::panicking::HOOK` static, and the hook in rustc's main (the default stdlib's) being executed
-// when rustc ICEs, instead of the overriden hook from `rustc_driver` (which also displays the query
-// stack and information on how to open a GH issue for the encountered ICE).
+// when rustc ICEs, instead of the overridden hook from `rustc_driver` (which also displays the
+// query stack and information on how to open a GH issue for the encountered ICE).
 //
 // In this test, we reproduce this setup by installing a panic hook in both the main and an LTOed
 // dylib: the last hook set should be the one being executed, the dylib's.