Skip to content

Commit cd53a43

Browse files
committed
Auto merge of rust-lang#2843 - jsoref:spelling, r=RalfJung
Spelling This PR corrects misspellings identified by the [check-spelling action](https://github.com/marketplace/actions/check-spelling). The misspellings have been reported at https://github.com/jsoref/miri/actions/runs/4699927237#summary-12751183650 The action reports that the changes in this PR would make it happy: https://github.com/jsoref/miri/actions/runs/4699927572#summary-12751184493
2 parents cf6b862 + 49be529 commit cd53a43

Some content is hidden

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

50 files changed

+77
-77
lines changed

src/tools/miri/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ to Miri failing to detect cases of undefined behavior in a program.
403403
* `-Zmiri-retag-fields=<all|none|scalar>` controls when Stacked Borrows retagging recurses into
404404
fields. `all` means it always recurses (like `-Zmiri-retag-fields`), `none` means it never
405405
recurses, `scalar` (the default) means it only recurses for types where we would also emit
406-
`noalias` annotations in the generated LLVM IR (types passed as indivudal scalars or pairs of
406+
`noalias` annotations in the generated LLVM IR (types passed as individual scalars or pairs of
407407
scalars). Setting this to `none` is **unsound**.
408408
* `-Zmiri-tag-gc=<blocks>` configures how often the pointer tag garbage collector runs. The default
409409
is to search for and remove unreachable tags once every `10000` basic blocks. Setting this to

src/tools/miri/cargo-miri/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fn main() {
8181
"miri" => phase_cargo_miri(args),
8282
"runner" => phase_runner(args, RunnerPhase::Cargo),
8383
arg if arg == env::var("RUSTC").unwrap() => {
84-
// If the first arg is equal to the RUSTC env ariable (which should be set at this
84+
// If the first arg is equal to the RUSTC env variable (which should be set at this
8585
// point), then we need to behave as rustc. This is the somewhat counter-intuitive
8686
// behavior of having both RUSTC and RUSTC_WRAPPER set
8787
// (see https://github.com/rust-lang/cargo/issues/10886).

src/tools/miri/src/bin/miri.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ impl rustc_driver::Callbacks for MiriBeRustCompilerCalls {
120120
#[allow(rustc::potential_query_instability)] // rustc_codegen_ssa (where this code is copied from) also allows this lint
121121
fn config(&mut self, config: &mut Config) {
122122
if config.opts.prints.is_empty() && self.target_crate {
123-
// Queries overriden here affect the data stored in `rmeta` files of dependencies,
123+
// Queries overridden here affect the data stored in `rmeta` files of dependencies,
124124
// which will be used later in non-`MIRI_BE_RUSTC` mode.
125125
config.override_queries = Some(|_, local_providers, _| {
126126
// `exported_symbols` and `reachable_non_generics` provided by rustc always returns

src/tools/miri/src/borrow_tracker/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ pub enum BorrowTrackerMethod {
238238
}
239239

240240
impl BorrowTrackerMethod {
241-
pub fn instanciate_global_state(self, config: &MiriConfig) -> GlobalState {
241+
pub fn instantiate_global_state(self, config: &MiriConfig) -> GlobalState {
242242
RefCell::new(GlobalStateInner::new(
243243
self,
244244
config.tracked_pointer_tags.clone(),

src/tools/miri/src/borrow_tracker/stacked_borrows/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ impl<'history, 'ecx, 'mir, 'tcx> DiagnosticCx<'history, 'ecx, 'mir, 'tcx> {
292292
.rev()
293293
.find_map(|event| {
294294
// First, look for a Creation event where the tag and the offset matches. This
295-
// ensrues that we pick the right Creation event when a retag isn't uniform due to
295+
// ensures that we pick the right Creation event when a retag isn't uniform due to
296296
// Freeze.
297297
let range = event.retag.range;
298298
if event.retag.new_tag == tag

src/tools/miri/src/borrow_tracker/stacked_borrows/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ impl<'tcx> Stack {
433433
let (Some(granting_idx), ProvenanceExtra::Concrete(_)) = (granting_idx, derived_from) else {
434434
// The parent is a wildcard pointer or matched the unknown bottom.
435435
// This is approximate. Nobody knows what happened, so forget everything.
436-
// The new thing is SRW anyway, so we cannot push it "on top of the unkown part"
436+
// The new thing is SRW anyway, so we cannot push it "on top of the unknown part"
437437
// (for all we know, it might join an SRW group inside the unknown).
438438
trace!("reborrow: forgetting stack entirely due to SharedReadWrite reborrow from wildcard or unknown");
439439
self.set_unknown_bottom(global.next_ptr_tag);
@@ -825,7 +825,7 @@ trait EvalContextPrivExt<'mir: 'ecx, 'tcx: 'mir, 'ecx>: crate::MiriInterpCxExt<'
825825
Ok(Some(alloc_id))
826826
}
827827

828-
/// Retags an indidual pointer, returning the retagged version.
828+
/// Retags an individual pointer, returning the retagged version.
829829
/// `kind` indicates what kind of reference is being created.
830830
fn sb_retag_reference(
831831
&mut self,

src/tools/miri/src/borrow_tracker/stacked_borrows/stack.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ impl Stack {
5151
// Note that the algorithm below is based on considering the tag at read_idx - 1,
5252
// so precisely considering the tag at index 0 for removal when we have an unknown
5353
// bottom would complicate the implementation. The simplification of not considering
54-
// it does not have a significant impact on the degree to which the GC mititages
54+
// it does not have a significant impact on the degree to which the GC mitigates
5555
// memory growth.
5656
let mut read_idx = 1;
5757
let mut write_idx = read_idx;

src/tools/miri/src/borrow_tracker/tree_borrows/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ trait EvalContextPrivExt<'mir: 'ecx, 'tcx: 'mir, 'ecx>: crate::MiriInterpCxExt<'
283283
Ok(Some((alloc_id, new_tag)))
284284
}
285285

286-
/// Retags an indidual pointer, returning the retagged version.
286+
/// Retags an individual pointer, returning the retagged version.
287287
fn tb_retag_reference(
288288
&mut self,
289289
val: &ImmTy<'tcx, Provenance>,

src/tools/miri/src/borrow_tracker/tree_borrows/perms.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ mod transition {
113113
}
114114

115115
impl PermissionPriv {
116-
/// Determines whether a transition that occured is compatible with the presence
116+
/// Determines whether a transition that occurred is compatible with the presence
117117
/// of a Protector. This is not included in the `transition` functions because
118118
/// it would distract from the few places where the transition is modified
119119
/// because of a protector, but not forbidden.

src/tools/miri/src/borrow_tracker/tree_borrows/tree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub(super) struct LocationState {
3434
/// Before initialization we still apply some preemptive transitions on
3535
/// `permission` to know what to do in case it ever gets initialized,
3636
/// but these can never cause any immediate UB. There can however be UB
37-
/// the moment we attempt to initalize (i.e. child-access) because some
37+
/// the moment we attempt to initialize (i.e. child-access) because some
3838
/// foreign access done between the creation and the initialization is
3939
/// incompatible with child accesses.
4040
initialized: bool,

0 commit comments

Comments
 (0)