Skip to content

Commit 32d2385

Browse files
committed
Auto merge of rust-lang#140935 - omahs:patch-5, r=jieyouxu
Fix typos Fix typos
2 parents 3ae0b2e + 1caaa88 commit 32d2385

File tree

17 files changed

+23
-23
lines changed

17 files changed

+23
-23
lines changed

compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
896896
let ret = self.arena.alloc_from_iter(lowered_attrs);
897897

898898
// this is possible if an item contained syntactical attribute,
899-
// but none of them parse succesfully or all of them were ignored
899+
// but none of them parse successfully or all of them were ignored
900900
// for not being built-in attributes at all. They could be remaining
901901
// unexpanded attributes used as markers in proc-macro derives for example.
902902
// This will have emitted some diagnostics for the misparse, but will then

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
387387
[sym::arm, sym::a32 | sym::t32]
388388
if !tcx.sess.target.has_thumb_interworking =>
389389
{
390-
tcx.dcx().emit_err(errors::UnsuportedInstructionSet {
390+
tcx.dcx().emit_err(errors::UnsupportedInstructionSet {
391391
span: attr.span(),
392392
});
393393
None

compiler/rustc_codegen_ssa/src/errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ pub(crate) struct NullOnExport {
149149

150150
#[derive(Diagnostic)]
151151
#[diag(codegen_ssa_unsupported_instruction_set, code = E0779)]
152-
pub(crate) struct UnsuportedInstructionSet {
152+
pub(crate) struct UnsupportedInstructionSet {
153153
#[primary_span]
154154
pub span: Span,
155155
}

compiler/rustc_hir_analysis/messages.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ hir_analysis_trait_object_declared_with_no_traits =
522522
at least one trait is required for an object type
523523
.alias_span = this alias does not contain a trait
524524
525-
hir_analysis_traits_with_defualt_impl = traits with a default impl, like `{$traits}`, cannot be implemented for {$problematic_kind} `{$self_ty}`
525+
hir_analysis_traits_with_default_impl = traits with a default impl, like `{$traits}`, cannot be implemented for {$problematic_kind} `{$self_ty}`
526526
.note = a trait object implements `{$traits}` if and only if `{$traits}` is one of the trait object's trait bounds
527527
528528
hir_analysis_transparent_enum_variant = transparent enum needs exactly one variant, but has {$number}

compiler/rustc_hir_analysis/src/errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1327,7 +1327,7 @@ pub(crate) struct ImplForTyRequires {
13271327
}
13281328

13291329
#[derive(Diagnostic)]
1330-
#[diag(hir_analysis_traits_with_defualt_impl, code = E0321)]
1330+
#[diag(hir_analysis_traits_with_default_impl, code = E0321)]
13311331
#[note]
13321332
pub(crate) struct TraitsWithDefaultImpl<'a> {
13331333
#[primary_span]

compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2339,7 +2339,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
23392339
}
23402340

23412341
if !mismatched_params.is_empty() {
2342-
// For each mismatched paramter, create a two-way link to each matched parameter
2342+
// For each mismatched parameter, create a two-way link to each matched parameter
23432343
// of the same type.
23442344
let mut dependants = IndexVec::<ExpectedIdx, _>::from_fn_n(
23452345
|_| SmallVec::<[u32; 4]>::new(),

compiler/rustc_interface/src/passes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,7 @@ pub fn create_and_enter_global_ctxt<T, F: for<'tcx> FnOnce(TyCtxt<'tcx>) -> T>(
907907
feed.output_filenames(Arc::new(outputs));
908908

909909
let res = f(tcx);
910-
// FIXME maybe run finish even when a fatal error occured? or at least tcx.alloc_self_profile_query_strings()?
910+
// FIXME maybe run finish even when a fatal error occurred? or at least tcx.alloc_self_profile_query_strings()?
911911
tcx.finish();
912912
res
913913
},

compiler/rustc_macros/src/symbols.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ fn symbols_with_errors(input: TokenStream) -> (TokenStream, Vec<syn::Error>) {
299299
let output = quote! {
300300
const SYMBOL_DIGITS_BASE: u32 = #symbol_digits_base;
301301

302-
/// The number of predefined symbols; this is the the first index for
302+
/// The number of predefined symbols; this is the first index for
303303
/// extra pre-interned symbols in an Interner created via
304304
/// [`Interner::with_extra_symbols`].
305305
pub const PREDEFINED_SYMBOLS_COUNT: u32 = #predefined_symbols_count;

compiler/rustc_mir_build/src/builder/scope.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
14851485
/// panic occurred (a subset of the drops in `scope`, since we sometimes elide StorageDead and other
14861486
/// instructions on unwinding)
14871487
/// * `dropline_to`, describes the drops that would occur at this point in the code if a
1488-
/// coroutine drop occured.
1488+
/// coroutine drop occurred.
14891489
/// * `storage_dead_on_unwind`, if true, then we should emit `StorageDead` even when unwinding
14901490
/// * `arg_count`, number of MIR local variables corresponding to fn arguments (used to assert that we don't drop those)
14911491
fn build_scope_drops<'tcx, F>(

compiler/rustc_next_trait_solver/src/solve/assembly/structural_traits.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ where
945945

946946
// This is quite similar to the `projection_may_match` we use in unsizing,
947947
// but here we want to unify a projection predicate against an alias term
948-
// so we can replace it with the the projection predicate's term.
948+
// so we can replace it with the projection predicate's term.
949949
let mut matching_projections = replacements
950950
.iter()
951951
.filter(|source_projection| self.projection_may_match(**source_projection, alias_term));

0 commit comments

Comments
 (0)