Skip to content

Commit 1d4e6e7

Browse files
committed
Auto merge of #3175 - RalfJung:sysroot-verbose, r=RalfJung
cargo-miri: when verbose, print where the sysroot is being built Fixes #3169
2 parents 02baccc + f91209e commit 1d4e6e7

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

cargo-miri/src/setup.rs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
33
use std::env;
44
use std::ffi::OsStr;
5+
use std::fmt::Write;
56
use std::path::PathBuf;
67
use std::process::{self, Command};
78

@@ -140,12 +141,20 @@ pub fn setup(
140141
// Do the build.
141142
if print_sysroot {
142143
// Be silent.
143-
} else if only_setup {
144-
// We want to be explicit.
145-
eprintln!("Preparing a sysroot for Miri (target: {target})...");
146144
} else {
147-
// We want to be quiet, but still let the user know that something is happening.
148-
eprint!("Preparing a sysroot for Miri (target: {target})... ");
145+
let mut msg = String::new();
146+
write!(msg, "Preparing a sysroot for Miri (target: {target})").unwrap();
147+
if verbose > 0 {
148+
write!(msg, " in {}", sysroot_dir.display()).unwrap();
149+
}
150+
write!(msg, "...").unwrap();
151+
if only_setup {
152+
// We want to be explicit.
153+
eprintln!("{msg}");
154+
} else {
155+
// We want to be quiet, but still let the user know that something is happening.
156+
eprint!("{msg} ");
157+
}
149158
}
150159
SysrootBuilder::new(&sysroot_dir, target)
151160
.build_mode(BuildMode::Check)

0 commit comments

Comments
 (0)