Skip to content

./miri run: verbose by default, add flag to be quiet #4665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 7, 2025
Merged

./miri run: verbose by default, add flag to be quiet #4665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc2dd75
./miri run: verbose by default, add flag to be quiet
RalfJung Nov 4, 2025
65bc9ff
fix 'cargo miri setup' quietness
RalfJung Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions miri-script/src/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ impl MiriEnv {
.arg("--")
.args(&["miri", "setup", "--print-sysroot"])
.args(target_flag);
cmd.set_quiet(quiet);
if quiet {
cmd = cmd.arg("--quiet");
}
let output = cmd.read()?;
self.sh.set_var("MIRI_SYSROOT", &output);
Ok(output.into())
Expand Down Expand Up @@ -112,8 +114,8 @@ impl Command {
Command::Check { features, flags } => Self::check(features, flags),
Command::Test { bless, target, coverage, features, flags } =>
Self::test(bless, target, coverage, features, flags),
Command::Run { dep, verbose, target, edition, features, flags } =>
Self::run(dep, verbose, target, edition, features, flags),
Command::Run { dep, quiet, target, edition, features, flags } =>
Self::run(dep, quiet, target, edition, features, flags),
Command::Doc { features, flags } => Self::doc(features, flags),
Command::Fmt { flags } => Self::fmt(flags),
Command::Clippy { features, flags } => Self::clippy(features, flags),
Expand Down Expand Up @@ -458,7 +460,7 @@ impl Command {

fn run(
dep: bool,
verbose: bool,
quiet: bool,
target: Option<String>,
edition: Option<String>,
features: Vec<String>,
Expand All @@ -468,7 +470,7 @@ impl Command {

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

// Run Miri.
// The basic command that executes the Miri driver.
Expand All @@ -506,7 +508,7 @@ impl Command {
} else {
cmd!(e.sh, "{miri_bin}")
};
cmd.set_quiet(!verbose);
cmd.set_quiet(quiet);
// Add Miri flags
let mut cmd = cmd.args(&miri_flags).args(&early_flags).args(&flags);
// For `--dep` we also need to set the target in the env var.
Expand Down
4 changes: 2 additions & 2 deletions miri-script/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ pub enum Command {
/// Build the program with the dependencies declared in `tests/deps/Cargo.toml`.
#[arg(long)]
dep: bool,
/// Show build progress.
/// Hide build progress.
#[arg(long, short)]
verbose: bool,
quiet: bool,
/// The cross-interpretation target.
#[arg(long)]
target: Option<String>,
Expand Down