Skip to content

Commit be9a616

Browse files
committed
Revert "Fix usages of old command API"
This reverts commit 29565e2.
1 parent 2061b6b commit be9a616

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/bootstrap/src/core/build_steps/tool.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,8 @@ impl Step for Rustdoc {
599599
.arg("--")
600600
.arg(librustdoc_src)
601601
.arg(rustdoc_src)
602-
.run(builder);
602+
.run(builder)
603+
.is_success();
603604

604605
if !has_changes {
605606
let precompiled_rustdoc = builder

src/bootstrap/src/utils/helpers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ pub fn get_closest_merge_base_commit(
534534
author: &str,
535535
target_paths: &[PathBuf],
536536
) -> Result<String, String> {
537-
let mut git = git(source_dir);
537+
let mut git = git(source_dir).capture_stdout();
538538

539539
let merge_base = get_git_merge_base(config, source_dir).unwrap_or_else(|_| "HEAD".into());
540540

0 commit comments

Comments
 (0)