Skip to content

Commit 78f51a4

Browse files
committed
Rename Builder::try_run to run_delaying_failure
1 parent 63d7992 commit 78f51a4

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

src/bootstrap/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ impl Build {
981981
}
982982

983983
/// Runs a command, printing out contextual info if it fails, and delaying errors until the build finishes.
984-
pub(crate) fn try_run(&self, cmd: &mut Command) -> bool {
984+
pub(crate) fn run_delaying_failure(&self, cmd: &mut Command) -> bool {
985985
if !self.fail_fast {
986986
#[allow(deprecated)] // can't use Build::try_run, that's us
987987
if self.config.try_run(cmd).is_err() {

src/bootstrap/run.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl Step for ExpandYamlAnchors {
2424
/// anchors in them, since GitHub Actions doesn't support them.
2525
fn run(self, builder: &Builder<'_>) {
2626
builder.info("Expanding YAML anchors in the GitHub Actions configuration");
27-
builder.try_run(
27+
builder.run_delaying_failure(
2828
&mut builder.tool_cmd(Tool::ExpandYamlAnchors).arg("generate").arg(&builder.src),
2929
);
3030
}

src/bootstrap/test.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,7 @@ You can skip linkcheck with --exclude src/tools/linkchecker"
180180
let _guard =
181181
builder.msg(Kind::Test, compiler.stage, "Linkcheck", bootstrap_host, bootstrap_host);
182182
let _time = util::timeit(&builder);
183-
builder.try_run(
184-
linkchecker.arg(builder.out.join(host.triple).join("doc")),
185-
);
183+
builder.run_delaying_failure(linkchecker.arg(builder.out.join(host.triple).join("doc")));
186184
}
187185

188186
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
@@ -235,7 +233,9 @@ impl Step for HtmlCheck {
235233
builder.default_doc(&[]);
236234
builder.ensure(crate::doc::Rustc::new(builder.top_stage, self.target, builder));
237235

238-
builder.try_run(builder.tool_cmd(Tool::HtmlChecker).arg(builder.doc_out(self.target)));
236+
builder.run_delaying_failure(
237+
builder.tool_cmd(Tool::HtmlChecker).arg(builder.doc_out(self.target)),
238+
);
239239
}
240240
}
241241

@@ -274,7 +274,7 @@ impl Step for Cargotest {
274274

275275
let _time = util::timeit(&builder);
276276
let mut cmd = builder.tool_cmd(Tool::CargoTest);
277-
builder.try_run(
277+
builder.run_delaying_failure(
278278
cmd.arg(&cargo)
279279
.arg(&out_dir)
280280
.args(builder.config.test_args())
@@ -876,7 +876,7 @@ impl Step for RustdocTheme {
876876
util::lld_flag_no_threads(self.compiler.host.contains("windows")),
877877
);
878878
}
879-
builder.try_run(&mut cmd);
879+
builder.run_delaying_failure(&mut cmd);
880880
}
881881
}
882882

@@ -1136,7 +1136,7 @@ help: to skip test's attempt to check tidiness, pass `--exclude src/tools/tidy`
11361136
}
11371137

11381138
builder.info("tidy check");
1139-
builder.try_run(&mut cmd);
1139+
builder.run_delaying_failure(&mut cmd);
11401140

11411141
builder.ensure(ExpandYamlAnchors);
11421142

@@ -1181,7 +1181,7 @@ impl Step for ExpandYamlAnchors {
11811181
/// by the user before committing CI changes.
11821182
fn run(self, builder: &Builder<'_>) {
11831183
builder.info("Ensuring the YAML anchors in the GitHub Actions config were expanded");
1184-
builder.try_run(
1184+
builder.run_delaying_failure(
11851185
&mut builder.tool_cmd(Tool::ExpandYamlAnchors).arg("check").arg(&builder.src),
11861186
);
11871187
}
@@ -1970,7 +1970,7 @@ impl BookTest {
19701970
compiler.host,
19711971
);
19721972
let _time = util::timeit(&builder);
1973-
let toolstate = if builder.try_run(&mut rustbook_cmd) {
1973+
let toolstate = if builder.run_delaying_failure(&mut rustbook_cmd) {
19741974
ToolState::TestPass
19751975
} else {
19761976
ToolState::TestFail
@@ -2132,7 +2132,7 @@ fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) ->
21322132
cmd.arg("--test-args").arg(test_args);
21332133

21342134
if builder.config.verbose_tests {
2135-
builder.try_run(&mut cmd)
2135+
builder.run_delaying_failure(&mut cmd)
21362136
} else {
21372137
try_run_quiet(builder, &mut cmd)
21382138
}
@@ -2160,7 +2160,7 @@ impl Step for RustcGuide {
21602160

21612161
let src = builder.src.join(relative_path);
21622162
let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
2163-
let toolstate = if builder.try_run(rustbook_cmd.arg("linkcheck").arg(&src)) {
2163+
let toolstate = if builder.run_delaying_failure(rustbook_cmd.arg("linkcheck").arg(&src)) {
21642164
ToolState::TestPass
21652165
} else {
21662166
ToolState::TestFail
@@ -2713,7 +2713,7 @@ impl Step for Bootstrap {
27132713
.current_dir(builder.src.join("src/bootstrap/"));
27142714
// NOTE: we intentionally don't pass test_args here because the args for unittest and cargo test are mutually incompatible.
27152715
// Use `python -m unittest` manually if you want to pass arguments.
2716-
builder.try_run(&mut check_bootstrap);
2716+
builder.run_delaying_failure(&mut check_bootstrap);
27172717

27182718
let mut cmd = Command::new(&builder.initial_cargo);
27192719
cmd.arg("test")
@@ -2789,7 +2789,7 @@ impl Step for TierCheck {
27892789
self.compiler.host,
27902790
self.compiler.host,
27912791
);
2792-
builder.try_run(&mut cargo.into());
2792+
builder.run_delaying_failure(&mut cargo.into());
27932793
}
27942794
}
27952795

@@ -2875,7 +2875,7 @@ impl Step for RustInstaller {
28752875
cmd.env("CARGO", &builder.initial_cargo);
28762876
cmd.env("RUSTC", &builder.initial_rustc);
28772877
cmd.env("TMP_DIR", &tmpdir);
2878-
builder.try_run(&mut cmd);
2878+
builder.run_delaying_failure(&mut cmd);
28792879
}
28802880

28812881
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {

0 commit comments

Comments
 (0)