Avoid more instances of unused command execution in dry run

durin42 · Jul 13, 2024 · 0cce0bb · 0cce0bb
1 parent 72c3540
commit 0cce0bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
@@ -2068,11 +2068,7 @@ fn maybe_install_llvm(
  let mut cmd = command(llvm_config);
  cmd.arg("--libfiles");
  builder.verbose(|| println!("running {cmd:?}"));
- let files = if builder.config.dry_run() {
- "".into()
- } else {
- cmd.capture_stdout().run(builder).stdout()
- };
+ let files = cmd.capture_stdout().run(builder).stdout();
  let build_llvm_out = &builder.llvm_out(builder.config.build);
  let target_llvm_out = &builder.llvm_out(target);
  for file in files.trim_end().split(' ') {

diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
@@ -471,16 +471,12 @@ impl Miri {
  // We re-use the `cargo` from above.
  cargo.arg("--print-sysroot");
 
- if builder.config.dry_run() {
- String::new()
- } else {
- builder.verbose(|| println!("running: {cargo:?}"));
- let stdout = cargo.capture_stdout().run(builder).stdout();
- // Output is "<sysroot>\n".
- let sysroot = stdout.trim_end();
- builder.verbose(|| println!("`cargo miri setup --print-sysroot` said: {sysroot:?}"));
- sysroot.to_owned()
- }
+ builder.verbose(|| println!("running: {cargo:?}"));
+ let stdout = cargo.capture_stdout().run(builder).stdout();
+ // Output is "<sysroot>\n".
+ let sysroot = stdout.trim_end();
+ builder.verbose(|| println!("`cargo miri setup --print-sysroot` said: {sysroot:?}"));
+ sysroot.to_owned()
  }
 }