Skip to content

Commit 6a9758d

Browse files
committed
Auto merge of #124058 - TechVest:master, r=fmease
Fix some typos in comments
2 parents 1c84675 + 45df09b commit 6a9758d

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

compiler/rustc_hir_analysis/src/collect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ fn lower_variant(
992992
.inspect(|f| {
993993
has_unnamed_fields |= f.ident.name == kw::Underscore;
994994
// We only check named ADT here because anonymous ADTs are checked inside
995-
// the nammed ADT in which they are defined.
995+
// the named ADT in which they are defined.
996996
if !is_anonymous {
997997
field_uniqueness_check_ctx.check_field(f);
998998
}

src/bootstrap/src/core/build_steps/compile.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub struct Std {
4343
/// This shouldn't be used from other steps; see the comment on [`Rustc`].
4444
crates: Vec<String>,
4545
/// When using download-rustc, we need to use a new build of `std` for running unit tests of Std itself,
46-
/// 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.
46+
/// 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.
4747
force_recompile: bool,
4848
extra_rust_args: &'static [&'static str],
4949
is_for_mir_opt_tests: bool,

src/librustdoc/passes/collect_intra_doc_links.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1420,7 +1420,7 @@ impl LinkCollector<'_, '_> {
14201420
//
14211421
// Otherwise, check if 2 links are same, if so, skip the resolve process.
14221422
//
1423-
// Notice that this algorithm is passive, might possibly miss actual redudant cases.
1423+
// Notice that this algorithm is passive, might possibly miss actual redundant cases.
14241424
let explicit_link = explicit_link.to_string();
14251425
let display_text = ori_link.display_text.as_ref().unwrap();
14261426

tests/ui/lto/issue-105637.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
//
44
// That manifested as both `rustc_driver` and rustc's "main" (`compiler/rustc`) having their own
55
// `std::panicking::HOOK` static, and the hook in rustc's main (the default stdlib's) being executed
6-
// when rustc ICEs, instead of the overriden hook from `rustc_driver` (which also displays the query
7-
// stack and information on how to open a GH issue for the encountered ICE).
6+
// when rustc ICEs, instead of the overridden hook from `rustc_driver` (which also displays the
7+
// query stack and information on how to open a GH issue for the encountered ICE).
88
//
99
// In this test, we reproduce this setup by installing a panic hook in both the main and an LTOed
1010
// dylib: the last hook set should be the one being executed, the dylib's.

0 commit comments

Comments
 (0)