Deduplicate cargo invocation logic

Author: oli-obk

src/toolchains.rs

@@ -257,12 +257,7 @@ impl Toolchain {
             }
             (None, None) => {
                 let mut cmd = Command::new("cargo");
-                cmd.arg(&format!("+{}", self.rustup_name()));
-                if cfg.args.command_args.is_empty() {
-                    cmd.arg("build");
-                } else {
-                    cmd.args(&cfg.args.command_args);
-                }
+                self.set_cargo_args_and_envs(&mut cmd, cfg);
                 cmd
             }
             (Some(script), Some(timeout)) => {
@@ -277,12 +272,7 @@ impl Toolchain {
                 let mut cmd = Command::new("timeout");
                 cmd.arg(timeout.to_string());
                 cmd.arg("cargo");
-                cmd.arg(format!("+{}", self.rustup_name()));
-                if cfg.args.command_args.is_empty() {
-                    cmd.arg("build");
-                } else {
-                    cmd.args(&cfg.args.command_args);
-                }
+                self.set_cargo_args_and_envs(&mut cmd, cfg);
                 cmd
             }
         };
@@ -326,6 +316,15 @@ impl Toolchain {
         output
     }
 
+    fn set_cargo_args_and_envs(&self, cmd: &mut Command, cfg: &Config) {
+        cmd.arg(&format!("+{}", self.rustup_name()));
+        if cfg.args.command_args.is_empty() {
+            cmd.arg("build");
+        } else {
+            cmd.args(&cfg.args.command_args);
+        }
+    }
+
     pub(crate) fn test(&self, cfg: &Config) -> TestOutcome {
         eprintln!("testing...");
         let outcome = if cfg.args.prompt {