Skip to content

Commit 646f564

Browse files
committed
Auto merge of rust-lang#3011 - saethlin:spellck, r=RalfJung
A bit of spell-checking I noticed the one error in miri-script and took care of a few more shallow ones.
2 parents 15c05fe + 3df2884 commit 646f564

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ fn main() {
5656
return;
5757
}
5858

59-
// The way rustdoc invokes rustc is indistuingishable from the way cargo invokes rustdoc by the
59+
// The way rustdoc invokes rustc is indistinguishable from the way cargo invokes rustdoc by the
6060
// arguments alone. `phase_cargo_rustdoc` sets this environment variable to let us disambiguate.
6161
if env::var_os("MIRI_CALLED_FROM_RUSTDOC").is_some() {
6262
// ...however, we then also see this variable when rustdoc invokes us as the testrunner!

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ pub fn phase_runner(mut binary_args: impl Iterator<Item = String>, phase: Runner
521521
// `.rmeta`.
522522
// We also need to remove `--error-format` as cargo specifies that to be JSON,
523523
// but when we run here, cargo does not interpret the JSON any more. `--json`
524-
// then also nees to be dropped.
524+
// then also needs to be dropped.
525525
let mut args = info.args.into_iter();
526526
let error_format_flag = "--error-format";
527527
let json_flag = "--json";

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ pub fn setup(
114114
command.arg("-v");
115115
}
116116
} else {
117-
// Supress output.
117+
// Suppress output.
118118
command.stdout(process::Stdio::null());
119119
command.stderr(process::Stdio::null());
120120
}

src/tools/miri/miri-script/src/commands.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl MiriEnv {
3333
Err(_) => vec![],
3434
};
3535
if !quiet {
36-
eprintln!("$ (buildig Miri sysroot)");
36+
eprintln!("$ (building Miri sysroot)");
3737
}
3838
let output = cmd!(self.sh,
3939
"cargo +{toolchain} --quiet run {cargo_extra_flags...} --manifest-path {manifest_path} --

src/tools/miri/src/helpers.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
337337
/// Call a function: Push the stack frame and pass the arguments.
338338
/// For now, arguments must be scalars (so that the caller does not have to know the layout).
339339
///
340-
/// If you do not provie a return place, a dangling zero-sized place will be created
340+
/// If you do not provide a return place, a dangling zero-sized place will be created
341341
/// for your convenience.
342342
fn call_function(
343343
&mut self,

src/tools/miri/src/machine.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ pub struct MiriMachine<'mir, 'tcx> {
427427
/// the emulated program.
428428
profiler: Option<measureme::Profiler>,
429429
/// Used with `profiler` to cache the `StringId`s for event names
430-
/// uesd with `measureme`.
430+
/// used with `measureme`.
431431
string_cache: FxHashMap<String, measureme::StringId>,
432432

433433
/// Cache of `Instance` exported under the given `Symbol` name.
@@ -516,7 +516,7 @@ impl<'mir, 'tcx> MiriMachine<'mir, 'tcx> {
516516
let pid = process::id();
517517
// We adopt the same naming scheme for the profiler output that rustc uses. In rustc,
518518
// the PID is padded so that the nondeterministic value of the PID does not spread
519-
// nondeterminisim to the allocator. In Miri we are not aiming for such performance
519+
// nondeterminism to the allocator. In Miri we are not aiming for such performance
520520
// control, we just pad for consistency with rustc.
521521
let filename = format!("{crate_name}-{pid:07}");
522522
let path = Path::new(out).join(filename);

0 commit comments

Comments
 (0)