Skip to content

Commit b8eee76

Browse files
committed
./miri run: verbose by default, add flag to be quiet
1 parent 6b394d4 commit b8eee76

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ impl Command {
112112
Command::Check { features, flags } => Self::check(features, flags),
113113
Command::Test { bless, target, coverage, features, flags } =>
114114
Self::test(bless, target, coverage, features, flags),
115-
Command::Run { dep, verbose, target, edition, features, flags } =>
116-
Self::run(dep, verbose, target, edition, features, flags),
115+
Command::Run { dep, quiet, target, edition, features, flags } =>
116+
Self::run(dep, quiet, target, edition, features, flags),
117117
Command::Doc { features, flags } => Self::doc(features, flags),
118118
Command::Fmt { flags } => Self::fmt(flags),
119119
Command::Clippy { features, flags } => Self::clippy(features, flags),
@@ -458,7 +458,7 @@ impl Command {
458458

459459
fn run(
460460
dep: bool,
461-
verbose: bool,
461+
quiet: bool,
462462
target: Option<String>,
463463
edition: Option<String>,
464464
features: Vec<String>,
@@ -468,7 +468,7 @@ impl Command {
468468

469469
// Preparation: get a sysroot, and get the miri binary.
470470
let miri_sysroot =
471-
e.build_miri_sysroot(/* quiet */ !verbose, target.as_deref(), &features)?;
471+
e.build_miri_sysroot(/* quiet */ quiet, target.as_deref(), &features)?;
472472
let miri_bin = e
473473
.build_get_binary(".", &features)
474474
.context("failed to get filename of miri executable")?;
@@ -492,7 +492,7 @@ impl Command {
492492
// Compute flags.
493493
let miri_flags = e.sh.var("MIRIFLAGS").unwrap_or_default();
494494
let miri_flags = flagsplit(&miri_flags);
495-
let quiet_flag = if verbose { None } else { Some("--quiet") };
495+
let quiet_flag = if quiet { Some("--quiet") } else { None };
496496

497497
// Run Miri.
498498
// The basic command that executes the Miri driver.
@@ -506,7 +506,7 @@ impl Command {
506506
} else {
507507
cmd!(e.sh, "{miri_bin}")
508508
};
509-
cmd.set_quiet(!verbose);
509+
cmd.set_quiet(quiet);
510510
// Add Miri flags
511511
let mut cmd = cmd.args(&miri_flags).args(&early_flags).args(&flags);
512512
// For `--dep` we also need to set the target in the env var.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ pub enum Command {
7878
/// Build the program with the dependencies declared in `tests/deps/Cargo.toml`.
7979
#[arg(long)]
8080
dep: bool,
81-
/// Show build progress.
81+
/// Hide build progress.
8282
#[arg(long, short)]
83-
verbose: bool,
83+
quiet: bool,
8484
/// The cross-interpretation target.
8585
#[arg(long)]
8686
target: Option<String>,

0 commit comments

Comments
 (0)