Reuse the command output helper

makes the output consistent and simplifies the code

Author: oli-obk

src/aux_builds.rs

@@ -3,6 +3,7 @@
 
 use crate::{
     build_manager::{Build, BuildManager},
+    core::run_command,
     custom_flags::Flag,
     default_per_file_config, display,
     per_test_config::{Comments, TestConfig},
@@ -122,7 +123,7 @@ impl Build for AuxBuilder {
 
         aux_cmd.arg("--emit=link");
         let filename = self.aux_file.file_stem().unwrap().to_str().unwrap();
-        let output = aux_cmd.output().unwrap();
+        let output = run_command(&mut aux_cmd)?;
         if !output.status.success() {
             let error = Error::Command {
                 kind: "compilation of aux build failed".to_string(),
@@ -138,7 +139,7 @@ impl Build for AuxBuilder {
 
         // Now run the command again to fetch the output filenames
         aux_cmd.arg("--print").arg("file-names");
-        let output = aux_cmd.output().unwrap();
+        let output = run_command(&mut aux_cmd)?;
 
         if build_manager.aborted() {
             return Err(Errored::aborted());

src/dependencies.rs

@@ -2,6 +2,7 @@
 
 use crate::{
     build_manager::{Build, BuildManager},
+    core::run_command,
     custom_flags::Flag,
     per_test_config::TestConfig,
     test_result::Errored,
@@ -37,17 +38,7 @@ fn cfgs(config: &Config) -> Result<Vec<Cfg>, Errored> {
     let mut cmd = config.program.build(&config.out_dir);
     cmd.arg(cfg);
     cmd.arg("--target").arg(config.target.as_ref().unwrap());
-    let output = match cmd.output() {
-        Ok(o) => o,
-        Err(e) => {
-            return Err(Errored {
-                command: format!("{cmd:?}"),
-                stderr: e.to_string().into_bytes(),
-                stdout: vec![],
-                errors: vec![],
-            })
-        }
-    };
+    let output = run_command(&mut cmd)?;
 
     if !output.status.success() {
         return Err(Errored {
@@ -106,17 +97,7 @@ fn build_dependencies_inner(
 
     build.arg("--message-format=json");
 
-    let output = match build.output() {
-        Err(e) => {
-            return Err(Errored {
-                command: format!("{build:?}"),
-                stderr: e.to_string().into_bytes(),
-                stdout: vec![],
-                errors: vec![],
-            })
-        }
-        Ok(o) => o,
-    };
+    let output = run_command(&mut build)?;
 
     if !output.status.success() {
         let stdout = output
@@ -212,17 +193,7 @@ fn build_dependencies_inner(
         .arg(&info.crate_manifest_path);
     info.program.apply_env(&mut metadata);
     set_locking(&mut metadata);
-    let output = match metadata.output() {
-        Err(e) => {
-            return Err(Errored {
-                command: format!("{metadata:?}"),
-                errors: vec![],
-                stderr: e.to_string().into_bytes(),
-                stdout: vec![],
-            })
-        }
-        Ok(output) => output,
-    };
+    let output = run_command(&mut metadata)?;
 
     if !output.status.success() {
         return Err(Errored {