Use run_cmd in run

Author: Kobzol

src/bootstrap/lib.rs

@@ -36,7 +36,7 @@ use once_cell::sync::OnceCell;
 
 use crate::builder::Kind;
 use crate::config::{LlvmLibunwind, TargetSelection};
-use crate::util::{dir_is_empty, exe, libdir, mtime, output, run, symlink_dir};
+use crate::util::{dir_is_empty, exe, libdir, mtime, output, symlink_dir};
 
 mod builder;
 mod cache;
@@ -966,11 +966,7 @@ impl Build {
 
     /// Runs a command, printing out nice contextual information if it fails.
     fn run(&self, cmd: &mut Command) {
-        if self.config.dry_run() {
-            return;
-        }
-        self.verbose(&format!("running: {cmd:?}"));
-        run(cmd, self.is_verbose())
+        self.run_cmd(cmd);
     }
 
     /// Runs a command, printing out nice contextual information if it fails.
@@ -1021,15 +1017,15 @@ impl Build {
                 writeln!(
                     message,
                     "\n\ncommand did not execute successfully: {:?}\n\
-                 expected success, got: {}\n\n",
+                    expected success, got: {}\n\n",
                     command.command, output.status
                 )
                 .unwrap();
                 if let OutputOnFailure::Verbose = output_on_failure {
                     writeln!(
                         message,
                         "stdout ----\n{}\n\
-             stderr ----\n{}\n\n",
+                         stderr ----\n{}\n\n",
                         String::from_utf8_lossy(&output.stdout),
                         String::from_utf8_lossy(&output.stderr)
                     )

src/bootstrap/util.rs

@@ -3,7 +3,7 @@
 //! Simple things like testing the various filesystem operations here and there,
 //! not a lot of interesting happenings here unfortunately.
 
-use build_helper::util::{fail, try_run};
+use build_helper::util::fail;
 use std::env;
 use std::fs;
 use std::io;
@@ -216,12 +216,6 @@ pub fn is_valid_test_suite_arg<'a, P: AsRef<Path>>(
     }
 }
 
-pub fn run(cmd: &mut Command, print_cmd_on_fail: bool) {
-    if try_run(cmd, print_cmd_on_fail).is_err() {
-        crate::exit!(1);
-    }
-}
-
 pub fn check_run(cmd: &mut Command, print_cmd_on_fail: bool) -> bool {
     let status = match cmd.status() {
         Ok(status) => status,