about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Beránek <berykubik@gmail.com>2024-07-23 08:43:02 +0200
committerJakub Beránek <berykubik@gmail.com>2024-07-26 09:17:34 +0200
commit29565e24e17826d34b0c515bc0cc32758a8ff937 (patch)
treec7285d20d84298892d66e89fff6d0bdae35a5fa2
parent82d5743e0b1ecd1995d3bee1a03ec2571b3ffdad (diff)
downloadrust-29565e24e17826d34b0c515bc0cc32758a8ff937.tar.gz
rust-29565e24e17826d34b0c515bc0cc32758a8ff937.zip
Fix usages of old command API
-rw-r--r--src/bootstrap/src/core/build_steps/tool.rs3
-rw-r--r--src/bootstrap/src/utils/helpers.rs2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs
index 7f2eb9b7a8c..06bb8259fc4 100644
--- a/src/bootstrap/src/core/build_steps/tool.rs
+++ b/src/bootstrap/src/core/build_steps/tool.rs
@@ -589,8 +589,7 @@ impl Step for Rustdoc {
                 .arg("--")
                 .arg(librustdoc_src)
                 .arg(rustdoc_src)
-                .run(builder)
-                .is_success();
+                .run(builder);
 
             if !has_changes {
                 let precompiled_rustdoc = builder
diff --git a/src/bootstrap/src/utils/helpers.rs b/src/bootstrap/src/utils/helpers.rs
index c6e70656670..51c14ff6282 100644
--- a/src/bootstrap/src/utils/helpers.rs
+++ b/src/bootstrap/src/utils/helpers.rs
@@ -534,7 +534,7 @@ pub fn get_closest_merge_base_commit(
     author: &str,
     target_paths: &[PathBuf],
 ) -> Result<String, String> {
-    let mut git = git(source_dir).capture_stdout();
+    let mut git = git(source_dir);
 
     let merge_base = get_git_merge_base(config, source_dir).unwrap_or_else(|_| "HEAD".into());