Skip to content

Commit e6bd905

Browse files
committed
rebase and fix new typos
1 parent 92014e7 commit e6bd905

File tree

55 files changed

+66
-65
lines changed

Some content is hidden

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

55 files changed

+66
-65
lines changed

compiler/rustc_ast/src/visit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ macro_rules! common_visitor_and_walkers {
142142
)?
143143

144144
// Methods in this trait have one of three forms, with the last two forms
145-
// only occuring on `MutVisitor`:
145+
// only occurring on `MutVisitor`:
146146
//
147147
// fn visit_t(&mut self, t: &mut T); // common
148148
// fn flat_map_t(&mut self, t: T) -> SmallVec<[T; 1]>; // rare

compiler/rustc_ast_passes/messages.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ast_passes_abi_cannot_be_coroutine =
22
functions with the {$abi} ABI cannot be `{$coroutine_kind_str}`
3-
.suggestion = remove the `{$coroutine_kind_str}` keyword from this definiton
3+
.suggestion = remove the `{$coroutine_kind_str}` keyword from this definition
44
55
ast_passes_abi_custom_safe_foreign_function =
66
foreign functions with the "custom" ABI cannot be safe

compiler/rustc_attr_parsing/src/attributes/cfg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::{fluent_generated, parse_version};
1414

1515
/// Emitter of a builtin lint from `cfg_matches`.
1616
///
17-
/// Used to support emiting a lint (currently on check-cfg), either:
17+
/// Used to support emitting a lint (currently on check-cfg), either:
1818
/// - as an early buffered lint (in `rustc`)
1919
/// - or has a "normal" lint from HIR (in `rustdoc`)
2020
pub trait CfgMatchesLintEmitter {

compiler/rustc_attr_parsing/src/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ impl Stage for Late {
180180
}
181181
}
182182

183-
/// used when parsing attributes for miscelaneous things *before* ast lowering
183+
/// used when parsing attributes for miscellaneous things *before* ast lowering
184184
pub struct Early;
185185
/// used when parsing attributes during ast lowering
186186
pub struct Late;

compiler/rustc_builtin_macros/src/autodiff.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ mod llvm_enzyme {
562562
/// so instead we manually build something that should pass the type checker.
563563
/// We also add a inline_asm line, as one more barrier for rustc to prevent inlining
564564
/// or const propagation. inline_asm will also triggers an Enzyme crash if due to another
565-
/// bug would ever try to accidentially differentiate this placeholder function body.
565+
/// bug would ever try to accidentally differentiate this placeholder function body.
566566
/// Finally, we also add back_box usages of all input arguments, to prevent rustc
567567
/// from optimizing any arguments away.
568568
fn gen_enzyme_body(
@@ -606,7 +606,7 @@ mod llvm_enzyme {
606606
return body;
607607
}
608608

609-
// Everything from here onwards just tries to fullfil the return type. Fun!
609+
// Everything from here onwards just tries to fulfil the return type. Fun!
610610

611611
// having an active-only return means we'll drop the original return type.
612612
// So that can be treated identical to not having one in the first place.

compiler/rustc_codegen_llvm/src/intrinsic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ fn call_simple_intrinsic<'ll, 'tcx>(
107107
sym::minimumf32 => ("llvm.minimum", &[bx.type_f32()]),
108108
sym::minimumf64 => ("llvm.minimum", &[bx.type_f64()]),
109109
// There are issues on x86_64 and aarch64 with the f128 variant,
110-
// let's instead use the instrinsic fallback body.
110+
// let's instead use the intrinsic fallback body.
111111
// sym::minimumf128 => ("llvm.minimum", &[cx.type_f128()]),
112112
sym::maxnumf16 => ("llvm.maxnum", &[bx.type_f16()]),
113113
sym::maxnumf32 => ("llvm.maxnum", &[bx.type_f32()]),
@@ -118,7 +118,7 @@ fn call_simple_intrinsic<'ll, 'tcx>(
118118
sym::maximumf32 => ("llvm.maximum", &[bx.type_f32()]),
119119
sym::maximumf64 => ("llvm.maximum", &[bx.type_f64()]),
120120
// There are issues on x86_64 and aarch64 with the f128 variant,
121-
// let's instead use the instrinsic fallback body.
121+
// let's instead use the intrinsic fallback body.
122122
// sym::maximumf128 => ("llvm.maximum", &[cx.type_f128()]),
123123
sym::copysignf16 => ("llvm.copysign", &[bx.type_f16()]),
124124
sym::copysignf32 => ("llvm.copysign", &[bx.type_f32()]),

compiler/rustc_codegen_ssa/src/back/metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ pub(super) fn elf_e_flags(architecture: Architecture, sess: &Session) -> u32 {
301301
"n32" if !is_32bit => e_flags |= elf::EF_MIPS_ABI2,
302302
"n64" if !is_32bit => {}
303303
"" if is_32bit => e_flags |= elf::EF_MIPS_ABI_O32,
304-
"" => sess.dcx().fatal("LLVM ABI must be specifed for 64-bit MIPS targets"),
304+
"" => sess.dcx().fatal("LLVM ABI must be specified for 64-bit MIPS targets"),
305305
s if is_32bit => {
306306
sess.dcx().fatal(format!("invalid LLVM ABI `{}` for 32-bit MIPS target", s))
307307
}

compiler/rustc_const_eval/src/interpret/validity.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ impl<'rt, 'tcx, M: Machine<'tcx>> ValidityVisitor<'rt, 'tcx, M> {
868868
fn add_data_range(&mut self, ptr: Pointer<Option<M::Provenance>>, size: Size) {
869869
if let Some(data_bytes) = self.data_bytes.as_mut() {
870870
// We only have to store the offset, the rest is the same for all pointers here.
871-
// The logic is agnostic to wether the offset is relative or absolute as long as
871+
// The logic is agnostic to whether the offset is relative or absolute as long as
872872
// it is consistent.
873873
let (_prov, offset) = ptr.into_raw_parts();
874874
// Add this.

compiler/rustc_expand/src/proc_macro_server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ impl server::Span for Rustc<'_, '_> {
681681
.lookup_char_pos(span.lo())
682682
.file
683683
.name
684-
.prefer_remapped_unconditionaly()
684+
.prefer_remapped_unconditionally()
685685
.to_string()
686686
}
687687

compiler/rustc_hir_typeck/src/coercion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> {
729729
Err(SelectionError::TraitDynIncompatible(_)) => {
730730
// Dyn compatibility errors in coercion will *always* be due to the
731731
// fact that the RHS of the coercion is a non-dyn compatible `dyn Trait`
732-
// writen in source somewhere (otherwise we will never have lowered
732+
// written in source somewhere (otherwise we will never have lowered
733733
// the dyn trait from HIR to middle).
734734
//
735735
// There's no reason to emit yet another dyn compatibility error,

0 commit comments

Comments
 (0)