Skip to content

Commit b4b6bff

Browse files
committed
cargo-miri: reorder a comment to make it less confusing
1 parent a66ca27 commit b4b6bff

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ pub fn phase_cargo_miri(mut args: impl Iterator<Item = String>) {
213213
}
214214

215215
// Run cargo.
216-
debug_cmd("[cargo-miri miri]", verbose, &cmd);
216+
debug_cmd("[cargo-miri cargo]", verbose, &cmd);
217217
exec(cmd)
218218
}
219219

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ pub fn setup(
9090
let cargo_cmd = {
9191
let mut command = cargo();
9292
// Use Miri as rustc to build a libstd compatible with us (and use the right flags).
93+
// We set ourselves (`cargo-miri`) instead of Miri directly to be able to patch the flags
94+
// for `libpanic_abort` (usually this is done by bootstrap but we have to do it ourselves).
95+
// The `MIRI_CALLED_FROM_SETUP` will mean we dispatch to `phase_setup_rustc`.
9396
// However, when we are running in bootstrap, we cannot just overwrite `RUSTC`,
9497
// because we still need bootstrap to distinguish between host and target crates.
9598
// In that case we overwrite `RUSTC_REAL` instead which determines the rustc used
9699
// for target crates.
97-
// We set ourselves (`cargo-miri`) instead of Miri directly to be able to patch the flags
98-
// for `libpanic_abort` (usually this is done by bootstrap but we have to do it ourselves).
99-
// The `MIRI_CALLED_FROM_SETUP` will mean we dispatch to `phase_setup_rustc`.
100100
let cargo_miri_path = std::env::current_exe().expect("current executable path invalid");
101101
if env::var_os("RUSTC_STAGE").is_some() {
102102
assert!(env::var_os("RUSTC").is_some());

0 commit comments

Comments
 (0)