diff options
| -rw-r--r-- | src/bootstrap/src/core/config/config.rs | 16 | ||||
| -rw-r--r-- | src/bootstrap/src/core/download.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/src/utils/helpers.rs | 18 |
3 files changed, 9 insertions, 27 deletions
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs index 8eb13fab251..f9980ac5fe1 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs @@ -1379,7 +1379,7 @@ impl Config { .run_always() .args(["submodule", "-q", "sync"]) .arg(relative_path) - .run(&self); + .run(self); // Try passing `--progress` to start, then run git again without if that fails. let update = |progress: bool| { @@ -1408,23 +1408,23 @@ impl Config { git.arg(relative_path); git }; - if !update(true).allow_failure().run(&self) { - update(false).allow_failure().run(&self); + if !update(true).allow_failure().run(self) { + update(false).allow_failure().run(self); } // Save any local changes, but avoid running `git stash pop` if there are none (since it will exit with an error). // diff-index reports the modifications through the exit status let has_local_modifications = - !submodule_git().allow_failure().args(["diff-index", "--quiet", "HEAD"]).run(&self); + !submodule_git().allow_failure().args(["diff-index", "--quiet", "HEAD"]).run(self); if has_local_modifications { - submodule_git().allow_failure().args(["stash", "push"]).run(&self); + submodule_git().allow_failure().args(["stash", "push"]).run(self); } - submodule_git().allow_failure().args(["reset", "-q", "--hard"]).run(&self); - submodule_git().allow_failure().args(["clean", "-qdfx"]).run(&self); + submodule_git().allow_failure().args(["reset", "-q", "--hard"]).run(self); + submodule_git().allow_failure().args(["clean", "-qdfx"]).run(self); if has_local_modifications { - submodule_git().allow_failure().args(["stash", "pop"]).run(&self); + submodule_git().allow_failure().args(["stash", "pop"]).run(self); } } diff --git a/src/bootstrap/src/core/download.rs b/src/bootstrap/src/core/download.rs index da5cd577106..d7c6d8dbcc3 100644 --- a/src/bootstrap/src/core/download.rs +++ b/src/bootstrap/src/core/download.rs @@ -244,7 +244,7 @@ impl Config { curl.arg("--retry-all-errors"); } curl.arg(url); - if !curl.run(&self) { + if !curl.run(self) { if self.host_target.contains("windows-msvc") { eprintln!("Fallback to PowerShell"); for _ in 0..3 { diff --git a/src/bootstrap/src/utils/helpers.rs b/src/bootstrap/src/utils/helpers.rs index 3e04e046844..8b2f2dd431e 100644 --- a/src/bootstrap/src/utils/helpers.rs +++ b/src/bootstrap/src/utils/helpers.rs @@ -270,24 +270,6 @@ pub fn is_valid_test_suite_arg<'a, P: AsRef<Path>>( } } -// FIXME: get rid of this function -pub fn check_run(cmd: &mut BootstrapCommand, print_cmd_on_fail: bool) -> bool { - let status = match cmd.as_command_mut().status() { - Ok(status) => status, - Err(e) => { - println!("failed to execute command: {cmd:?}\nERROR: {e}"); - return false; - } - }; - if !status.success() && print_cmd_on_fail { - println!( - "\n\ncommand did not execute successfully: {cmd:?}\n\ - expected success, got: {status}\n\n" - ); - } - status.success() -} - pub fn make(host: &str) -> PathBuf { if host.contains("dragonfly") || host.contains("freebsd") |