Skip to content

Commit b32223f

Browse files
committed
Auto merge of #100707 - dzvon:fix-typo, r=davidtwco
Fix a bunch of typo This PR will fix some typos detected by [typos]. I only picked the ones I was sure were spelling errors to fix, mostly in the comments. [typos]: https://github.com/crate-ci/typos
2 parents aa857eb + 1770693 commit b32223f

File tree

140 files changed

+171
-171
lines changed

Some content is hidden

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

140 files changed

+171
-171
lines changed

RELEASES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,7 +1442,7 @@ Compatibility Notes
14421442
- [Mixing Option and Result via `?` is no longer permitted in closures for inferred types.][86831]
14431443
- [Previously unsound code is no longer permitted where different constructors in branches
14441444
could require different lifetimes.][85574]
1445-
- As previously mentioned the [`std::arch` instrinsics now uses stricter const checking][83278]
1445+
- As previously mentioned the [`std::arch` intrinsics now uses stricter const checking][83278]
14461446
than before and may reject some previously accepted code.
14471447
- [`i128` multiplication on Cortex M0+ platforms currently unconditionally causes overflow
14481448
when compiled with `codegen-units = 1`.][86063]
@@ -2520,7 +2520,7 @@ Compatibility Notes
25202520
- [Fixed a regression parsing `{} && false` in tail expressions.][74650]
25212521
- [Added changes to how proc-macros are expanded in `macro_rules!` that should
25222522
help to preserve more span information.][73084] These changes may cause
2523-
compiliation errors if your macro was unhygenic or didn't correctly handle
2523+
compilation errors if your macro was unhygenic or didn't correctly handle
25242524
`Delimiter::None`.
25252525
- [Moved support for the CloudABI target to tier 3.][75568]
25262526
- [`linux-gnu` targets now require minimum kernel 2.6.32 and glibc 2.11.][74163]

compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1179,7 +1179,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
11791179
) -> hir::Ty<'hir> {
11801180
// Check whether we should interpret this as a bare trait object.
11811181
// This check mirrors the one in late resolution. We only introduce this special case in
1182-
// the rare occurence we need to lower `Fresh` anonymous lifetimes.
1182+
// the rare occurrence we need to lower `Fresh` anonymous lifetimes.
11831183
// The other cases when a qpath should be opportunistically made a trait object are handled
11841184
// by `ty_path`.
11851185
if qself.is_none()

compiler/rustc_ast_passes/src/ast_validation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1800,7 +1800,7 @@ pub(crate) enum ForbiddenLetReason {
18001800
NotSupportedOr(Span),
18011801
/// A let chain with invalid parentheses
18021802
///
1803-
/// For exemple, `let 1 = 1 && (expr && expr)` is allowed
1803+
/// For example, `let 1 = 1 && (expr && expr)` is allowed
18041804
/// but `(let 1 = 1 && (let 1 = 1 && (let 1 = 1))) && let a = 1` is not
18051805
NotSupportedParentheses(Span),
18061806
}

compiler/rustc_codegen_cranelift/src/abi/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ pub(crate) fn codegen_terminator_call<'tcx>(
342342

343343
let ret_place = codegen_place(fx, destination);
344344

345-
// Handle special calls like instrinsics and empty drop glue.
345+
// Handle special calls like intrinsics and empty drop glue.
346346
let instance = if let ty::FnDef(def_id, substs) = *fn_ty.kind() {
347347
let instance = ty::Instance::resolve(fx.tcx, ty::ParamEnv::reveal_all(), def_id, substs)
348348
.unwrap()

compiler/rustc_codegen_cranelift/src/constant.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ pub(crate) fn check_constants(fx: &mut FunctionCx<'_, '_, '_>) -> bool {
5959
ErrorHandled::TooGeneric => {
6060
span_bug!(
6161
constant.span,
62-
"codgen encountered polymorphic constant: {:?}",
62+
"codegen encountered polymorphic constant: {:?}",
6363
err
6464
);
6565
}

compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ pub(crate) fn codegen_intrinsic_call<'tcx>(
203203
sym::transmute => {
204204
crate::base::codegen_panic(fx, "Transmuting to uninhabited type.", source_info);
205205
}
206-
_ => unimplemented!("unsupported instrinsic {}", intrinsic),
206+
_ => unimplemented!("unsupported intrinsic {}", intrinsic),
207207
}
208208
return;
209209
};

compiler/rustc_codegen_ssa/src/back/symbol_export.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ pub fn linking_symbol_name_for_instance_in_crate<'tcx>(
540540
.map(|fnabi| (fnabi.conv, &fnabi.args[..]))
541541
.unwrap_or((Conv::Rust, &[]));
542542

543-
// Decorate symbols with prefices, suffices and total number of bytes of arguments.
543+
// Decorate symbols with prefixes, suffixes and total number of bytes of arguments.
544544
// Reference: https://docs.microsoft.com/en-us/cpp/build/reference/decorated-names?view=msvc-170
545545
let (prefix, suffix) = match conv {
546546
Conv::X86Fastcall => ("@", "@"),

compiler/rustc_codegen_ssa/src/mir/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ pub fn codegen_mir<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
191191
// errored or at least linted
192192
ErrorHandled::Reported(_) | ErrorHandled::Linted => {}
193193
ErrorHandled::TooGeneric => {
194-
span_bug!(const_.span, "codgen encountered polymorphic constant: {:?}", err)
194+
span_bug!(const_.span, "codegen encountered polymorphic constant: {:?}", err)
195195
}
196196
}
197197
}

compiler/rustc_const_eval/src/interpret/intrinsics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
320320
let (a_offset, b_offset) =
321321
match (self.ptr_try_get_alloc_id(a), self.ptr_try_get_alloc_id(b)) {
322322
(Err(a), Err(b)) => {
323-
// Neither poiner points to an allocation.
323+
// Neither pointer points to an allocation.
324324
// If these are inequal or null, this *will* fail the deref check below.
325325
(a, b)
326326
}

compiler/rustc_const_eval/src/interpret/memory.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
437437
msg,
438438
})
439439
}
440-
// Ensure we never consider the null pointer dereferencable.
440+
// Ensure we never consider the null pointer dereferenceable.
441441
if M::Provenance::OFFSET_IS_ADDR {
442442
assert_ne!(ptr.addr(), Size::ZERO);
443443
}
@@ -914,7 +914,7 @@ impl<'tcx, 'a, Prov: Provenance, Extra> AllocRefMut<'a, 'tcx, Prov, Extra> {
914914
self.write_scalar(alloc_range(offset, self.tcx.data_layout().pointer_size), val)
915915
}
916916

917-
/// Mark the entire referenced range as uninitalized
917+
/// Mark the entire referenced range as uninitialized
918918
pub fn write_uninit(&mut self) -> InterpResult<'tcx> {
919919
Ok(self
920920
.alloc

0 commit comments

Comments
 (0)