mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #124058 - TechVest:master, r=fmease

Browse Source 
Fix some typos in comments
This commit is contained in:
bors 2024-04-25 13:02:08 +00:00
commit 6a9758d4f3
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_hir_analysis/src/collect.rs
View File

@ -992,7 +992,7 @@ fn lower_variant(
.inspect(|f| { .inspect(|f| {
has_unnamed_fields |= f.ident.name == kw::Underscore; has_unnamed_fields |= f.ident.name == kw::Underscore;
// We only check named ADT here because anonymous ADTs are checked inside // 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 { if !is_anonymous {
field_uniqueness_check_ctx.check_field(f); field_uniqueness_check_ctx.check_field(f);
} }

2
src/bootstrap/src/core/build_steps/compile.rs
View File

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

2
src/librustdoc/passes/collect_intra_doc_links.rs
View File

@ -1420,7 +1420,7 @@ fn resolve_display_text(
// //
// Otherwise, check if 2 links are same, if so, skip the resolve process. // 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 explicit_link = explicit_link.to_string();
let display_text = ori_link.display_text.as_ref().unwrap(); let display_text = ori_link.display_text.as_ref().unwrap();

4
tests/ui/lto/issue-105637.rs
View File

@ -3,8 +3,8 @@
// //
// That manifested as both `rustc_driver` and rustc's "main" (`compiler/rustc`) having their own // 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 // `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 // when rustc ICEs, instead of the overridden hook from `rustc_driver` (which also displays the
// stack and information on how to open a GH issue for the encountered ICE). // 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 // 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. // dylib: the last hook set should be the one being executed, the dylib's.