Auto merge of #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.
This commit is contained in:
bors 2023-08-04 06:16:02 +00:00
commit 646f5643ab
6 changed files with 7 additions and 7 deletions

View File

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

View File

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

View File

@ -114,7 +114,7 @@ pub fn setup(
command.arg("-v"); command.arg("-v");
} }
} else { } else {
// Supress output. // Suppress output.
command.stdout(process::Stdio::null()); command.stdout(process::Stdio::null());
command.stderr(process::Stdio::null()); command.stderr(process::Stdio::null());
} }

View File

@ -33,7 +33,7 @@ fn build_miri_sysroot(&mut self, quiet: bool) -> Result<()> {
Err(_) => vec![], Err(_) => vec![],
}; };
if !quiet { if !quiet {
eprintln!("$ (buildig Miri sysroot)"); eprintln!("$ (building Miri sysroot)");
} }
let output = cmd!(self.sh, let output = cmd!(self.sh,
"cargo +{toolchain} --quiet run {cargo_extra_flags...} --manifest-path {manifest_path} -- "cargo +{toolchain} --quiet run {cargo_extra_flags...} --manifest-path {manifest_path} --

View File

@ -337,7 +337,7 @@ fn gen_random(&mut self, ptr: Pointer<Option<Provenance>>, len: u64) -> InterpRe
/// Call a function: Push the stack frame and pass the arguments. /// Call a function: Push the stack frame and pass the arguments.
/// For now, arguments must be scalars (so that the caller does not have to know the layout). /// For now, arguments must be scalars (so that the caller does not have to know the layout).
/// ///
/// If you do not provie a return place, a dangling zero-sized place will be created /// If you do not provide a return place, a dangling zero-sized place will be created
/// for your convenience. /// for your convenience.
fn call_function( fn call_function(
&mut self, &mut self,

View File

@ -427,7 +427,7 @@ pub struct MiriMachine<'mir, 'tcx> {
/// the emulated program. /// the emulated program.
profiler: Option<measureme::Profiler>, profiler: Option<measureme::Profiler>,
/// Used with `profiler` to cache the `StringId`s for event names /// Used with `profiler` to cache the `StringId`s for event names
/// uesd with `measureme`. /// used with `measureme`.
string_cache: FxHashMap<String, measureme::StringId>, string_cache: FxHashMap<String, measureme::StringId>,
/// Cache of `Instance` exported under the given `Symbol` name. /// Cache of `Instance` exported under the given `Symbol` name.
@ -516,7 +516,7 @@ pub(crate) fn new(config: &MiriConfig, layout_cx: LayoutCx<'tcx, TyCtxt<'tcx>>)
let pid = process::id(); let pid = process::id();
// We adopt the same naming scheme for the profiler output that rustc uses. In rustc, // We adopt the same naming scheme for the profiler output that rustc uses. In rustc,
// the PID is padded so that the nondeterministic value of the PID does not spread // the PID is padded so that the nondeterministic value of the PID does not spread
// nondeterminisim to the allocator. In Miri we are not aiming for such performance // nondeterminism to the allocator. In Miri we are not aiming for such performance
// control, we just pad for consistency with rustc. // control, we just pad for consistency with rustc.
let filename = format!("{crate_name}-{pid:07}"); let filename = format!("{crate_name}-{pid:07}");
let path = Path::new(out).join(filename); let path = Path::new(out).join(filename);