migrate utils to use new run methods with execution context

Author: Shourya742

src/bootstrap/src/utils/build_stamp.rs

@@ -179,7 +179,7 @@ pub fn generate_smart_stamp_hash(
         .allow_failure()
         .arg("diff")
         .arg(".")
-        .run_capture_stdout(builder)
+        .run_capture_stdout(builder.context())
         .stdout_if_ok()
         .unwrap_or_default();
 
@@ -190,7 +190,7 @@ pub fn generate_smart_stamp_hash(
         .arg("--porcelain")
         .arg("-z")
         .arg("--untracked-files=normal")
-        .run_capture_stdout(builder)
+        .run_capture_stdout(builder.context())
         .stdout_if_ok()
         .unwrap_or_default();
 

src/bootstrap/src/utils/cc_detect.rs

@@ -182,14 +182,14 @@ fn default_compiler(
             }
 
             let mut cmd = BootstrapCommand::from(c.to_command());
-            let output = cmd.arg("--version").run_capture_stdout(build).stdout();
+            let output = cmd.arg("--version").run_capture_stdout(build.context()).stdout();
             let i = output.find(" 4.")?;
             match output[i + 3..].chars().next().unwrap() {
                 '0'..='6' => {}
                 _ => return None,
             }
             let alternative = format!("e{gnu_compiler}");
-            if command(&alternative).run_capture(build).is_success() {
+            if command(&alternative).run_capture(build.context()).is_success() {
                 Some(PathBuf::from(alternative))
             } else {
                 None

src/bootstrap/src/utils/channel.rs

@@ -8,6 +8,7 @@
 use std::fs;
 use std::path::Path;
 
+use super::execution_context::ExecutionContext;
 use super::helpers;
 use crate::Build;
 use crate::utils::helpers::{start_process, t};
@@ -34,7 +35,7 @@ pub struct Info {
 }
 
 impl GitInfo {
-    pub fn new(omit_git_hash: bool, dir: &Path) -> GitInfo {
+    pub fn new(omit_git_hash: bool, dir: &Path, execution_context: &ExecutionContext) -> GitInfo {
         // See if this even begins to look like a git dir
         if !dir.join(".git").exists() {
             match read_commit_info_file(dir) {
@@ -43,10 +44,12 @@ impl GitInfo {
             }
         }
 
+        let mut git_command = helpers::git(Some(dir));
+        git_command.arg("rev-parse");
+        let output = git_command.run_capture(&execution_context);
         // Make sure git commands work
-        match helpers::git(Some(dir)).arg("rev-parse").as_command_mut().output() {
-            Ok(ref out) if out.status.success() => {}
-            _ => return GitInfo::Absent,
+        if output.is_failure() {
+            return GitInfo::Absent;
         }
 
         // If we're ignoring the git info, we don't actually need to collect it, just make sure this

src/bootstrap/src/utils/helpers.rs

@@ -402,7 +402,7 @@ pub fn get_clang_cl_resource_dir(builder: &Builder<'_>, clang_cl_path: &str) ->
     let mut builtins_locator = command(clang_cl_path);
     builtins_locator.args(["/clang:-print-libgcc-file-name", "/clang:--rtlib=compiler-rt"]);
 
-    let clang_rt_builtins = builtins_locator.run_capture_stdout(builder).stdout();
+    let clang_rt_builtins = builtins_locator.run_capture_stdout(builder.context()).stdout();
     let clang_rt_builtins = Path::new(clang_rt_builtins.trim());
     assert!(
         clang_rt_builtins.exists(),
@@ -429,7 +429,7 @@ fn lld_flag_no_threads(builder: &Builder<'_>, lld_mode: LldMode, is_windows: boo
             LldMode::External => {
                 let mut cmd = command("lld");
                 cmd.arg("-flavor").arg("ld").arg("--version");
-                let out = cmd.run_capture_stdout(builder).stdout();
+                let out = cmd.run_capture_stdout(builder.context()).stdout();
                 match (out.find(char::is_numeric), out.find('.')) {
                     (Some(b), Some(e)) => out.as_str()[b..e].parse::<i32>().ok().unwrap_or(14) > 10,
                     _ => true,

src/bootstrap/src/utils/mod.rs

@@ -8,6 +8,7 @@ pub(crate) mod cc_detect;
 pub(crate) mod change_tracker;
 pub(crate) mod channel;
 pub(crate) mod exec;
+pub(crate) mod execution_context;
 pub(crate) mod helpers;
 pub(crate) mod job;
 pub(crate) mod render_tests;

src/bootstrap/src/utils/tarball.rs

@@ -393,12 +393,12 @@ impl<'a> Tarball<'a> {
                 .arg("log")
                 .arg("-1")
                 .arg("--format=%ct")
-                .run_capture_stdout(self.builder)
+                .run_capture_stdout(self.builder.context())
                 .stdout();
             cmd.args(["--override-file-mtime", timestamp.trim()]);
         }
 
-        cmd.run(self.builder);
+        cmd.run(self.builder.context());
 
         // Ensure there are no symbolic links in the tarball. In particular,
         // rustup-toolchain-install-master and most versions of Windows can't handle symbolic links.