Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 4e46301

Browse files
committed
Auto merge of #110492 - GuillaumeGomez:rollup-n4tpbl4, r=GuillaumeGomez
Rollup of 5 pull requests Successful merges: - #110417 (Spelling compiler) - #110441 (5 little typos) - #110485 (Fix bootstrap locking) - #110488 (Add a failing rustdoc-ui test for public infinite recursive type) - #110490 (Bump `download-ci-llvm-stamp` for loong support) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents de96f3d + e8f7b5a commit 4e46301

File tree

113 files changed

+183
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+183
-172
lines changed

‎compiler/rustc_ast_passes/messages.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ ast_passes_feature_on_non_nightly = `#![feature]` may not be used on the {$chann
231231
.suggestion = remove the attribute
232232
.stable_since = the feature `{$name}` has been stable since `{$since}` and no longer requires an attribute to enable
233233
234-
ast_passes_incompatbile_features = `{$f1}` and `{$f2}` are incompatible, using them at the same time is not allowed
234+
ast_passes_incompatible_features = `{$f1}` and `{$f2}` are incompatible, using them at the same time is not allowed
235235
.help = remove one of these features
236236
237237
ast_passes_show_span = {$msg}

‎compiler/rustc_ast_passes/src/errors.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ impl AddToDiagnostic for StableFeature {
677677
}
678678

679679
#[derive(Diagnostic)]
680-
#[diag(ast_passes_incompatbile_features)]
680+
#[diag(ast_passes_incompatible_features)]
681681
#[help]
682682
pub struct IncompatibleFeatures {
683683
#[primary_span]

‎compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ pub fn mut_borrow_of_mutable_ref(local_decl: &LocalDecl<'_>, local_name: Option<
11471147
// suggest removing the `&mut`.
11481148
//
11491149
// Deliberately fall into this case for all implicit self types,
1150-
// so that we don't fall in to the next case with them.
1150+
// so that we don't fall into the next case with them.
11511151
kind == hir::ImplicitSelfKind::MutRef
11521152
}
11531153
_ if Some(kw::SelfLower) == local_name => {
@@ -1235,7 +1235,7 @@ fn suggest_ampmut<'tcx>(
12351235
}
12361236
}
12371237

1238-
let (suggestability, highlight_span) = match opt_ty_info {
1238+
let (suggestibility, highlight_span) = match opt_ty_info {
12391239
// if this is a variable binding with an explicit type,
12401240
// try to highlight that for the suggestion.
12411241
Some(ty_span) => (true, ty_span),
@@ -1256,7 +1256,7 @@ fn suggest_ampmut<'tcx>(
12561256
let ty_mut = local_decl.ty.builtin_deref(true).unwrap();
12571257
assert_eq!(ty_mut.mutbl, hir::Mutability::Not);
12581258
(
1259-
suggestability,
1259+
suggestibility,
12601260
highlight_span,
12611261
if local_decl.ty.is_ref() {
12621262
format!("&mut {}", ty_mut.ty)

‎compiler/rustc_codegen_llvm/src/debuginfo/gdb.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ pub fn insert_reference_to_gdb_debug_scripts_section_global(bx: &mut Builder<'_,
2222
bx.const_bitcast(get_or_insert_gdb_debug_scripts_section_global(bx), bx.type_i8p());
2323
// Load just the first byte as that's all that's necessary to force
2424
// LLVM to keep around the reference to the global.
25-
let volative_load_instruction = bx.volatile_load(bx.type_i8(), gdb_debug_scripts_section);
25+
let volatile_load_instruction = bx.volatile_load(bx.type_i8(), gdb_debug_scripts_section);
2626
unsafe {
27-
llvm::LLVMSetAlignment(volative_load_instruction, 1);
27+
llvm::LLVMSetAlignment(volatile_load_instruction, 1);
2828
}
2929
}
3030
}

‎compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/cpp_like.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const SINGLE_VARIANT_VIRTUAL_DISR: u64 = 0;
6262

6363
/// In CPP-like mode, we generate a union with a field for each variant and an
6464
/// explicit tag field. The field of each variant has a struct type
65-
/// that encodes the discrimiant of the variant and it's data layout.
65+
/// that encodes the discriminant of the variant and it's data layout.
6666
/// The union also has a nested enumeration type that is only used for encoding
6767
/// variant names in an efficient way. Its enumerator values do _not_ correspond
6868
/// to the enum's discriminant values.

‎compiler/rustc_codegen_llvm/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ mod declare;
6969
mod errors;
7070
mod intrinsic;
7171

72-
// The following is a work around that replaces `pub mod llvm;` and that fixes issue 53912.
72+
// The following is a workaround that replaces `pub mod llvm;` and that fixes issue 53912.
7373
#[path = "llvm/mod.rs"]
7474
mod llvm_;
7575
pub mod llvm {

‎compiler/rustc_codegen_ssa/messages.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ codegen_ssa_processing_dymutil_failed = processing debug info with `dsymutil` fa
148148
149149
codegen_ssa_unable_to_run_dsymutil = unable to run `dsymutil`: {$error}
150150
151-
codegen_ssa_stripping_debu_info_failed = stripping debug info with `{$util}` failed: {$status}
151+
codegen_ssa_stripping_debug_info_failed = stripping debug info with `{$util}` failed: {$status}
152152
.note = {$output}
153153
154154
codegen_ssa_unable_to_run = unable to run `{$util}`: {$error}

‎compiler/rustc_codegen_ssa/src/back/write.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ fn execute_copy_from_cache_work_item<B: ExtraBackendMethods>(
872872
let load_from_incr_comp_dir = |output_path: PathBuf, saved_path: &str| {
873873
let source_file = in_incr_comp_dir(&incr_comp_session_dir, saved_path);
874874
debug!(
875-
"copying pre-existing module `{}` from {:?} to {}",
875+
"copying preexisting module `{}` from {:?} to {}",
876876
module.name,
877877
source_file,
878878
output_path.display()

‎compiler/rustc_codegen_ssa/src/codegen_attrs.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
156156
None => {
157157
// Unfortunately, unconditionally using `llvm.used` causes
158158
// issues in handling `.init_array` with the gold linker,
159-
// but using `llvm.compiler.used` caused a nontrival amount
159+
// but using `llvm.compiler.used` caused a nontrivial amount
160160
// of unintentional ecosystem breakage -- particularly on
161161
// Mach-O targets.
162162
//

‎compiler/rustc_codegen_ssa/src/errors.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ pub struct UnableToRunDsymutil {
424424
}
425425

426426
#[derive(Diagnostic)]
427-
#[diag(codegen_ssa_stripping_debu_info_failed)]
427+
#[diag(codegen_ssa_stripping_debug_info_failed)]
428428
#[note]
429429
pub struct StrippingDebugInfoFailed<'a> {
430430
pub util: &'a str,

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /