Remove run_delaying_failure · rust-lang/rust@0de7b92 (original) (raw)
`@@ -156,7 +156,10 @@ You can skip linkcheck with --skip src/tools/linkchecker"
`
156
156
`let _guard =
`
157
157
` builder.msg(Kind::Test, compiler.stage, "Linkcheck", bootstrap_host, bootstrap_host);
`
158
158
`let _time = helpers::timeit(builder);
`
159
``
`-
builder.run_delaying_failure(linkchecker.arg(builder.out.join(host.triple).join("doc")));
`
``
159
`+
builder.run_tracked(
`
``
160
`+
BootstrapCommand::from(linkchecker.arg(builder.out.join(host.triple).join("doc")))
`
``
161
`+
.delay_failure(),
`
``
162
`+
);
`
160
163
`}
`
161
164
``
162
165
`fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
`
`@@ -213,8 +216,11 @@ impl Step for HtmlCheck {
`
213
216
` builder,
`
214
217
`));
`
215
218
``
216
``
`-
builder.run_delaying_failure(
`
217
``
`-
builder.tool_cmd(Tool::HtmlChecker).arg(builder.doc_out(self.target)),
`
``
219
`+
builder.run_tracked(
`
``
220
`+
BootstrapCommand::from(
`
``
221
`+
builder.tool_cmd(Tool::HtmlChecker).arg(builder.doc_out(self.target)),
`
``
222
`+
)
`
``
223
`+
.delay_failure(),
`
218
224
`);
`
219
225
`}
`
220
226
`}
`
`@@ -261,7 +267,7 @@ impl Step for Cargotest {
`
261
267
`.env("RUSTC", builder.rustc(compiler))
`
262
268
`.env("RUSTDOC", builder.rustdoc(compiler));
`
263
269
`add_rustdoc_cargo_linker_args(cmd, builder, compiler.host, LldThreads::No);
`
264
``
`-
builder.run_delaying_failure(cmd);
`
``
270
`+
builder.run_tracked(BootstrapCommand::from(cmd).delay_failure());
`
265
271
`}
`
266
272
`}
`
267
273
``
`@@ -813,7 +819,7 @@ impl Step for RustdocTheme {
`
813
819
`.env("RUSTC_BOOTSTRAP", "1");
`
814
820
` cmd.args(linker_args(builder, self.compiler.host, LldThreads::No));
`
815
821
``
816
``
`-
builder.run_delaying_failure(&mut cmd);
`
``
822
`+
builder.run_tracked(BootstrapCommand::from(&mut cmd).delay_failure());
`
817
823
`}
`
818
824
`}
`
819
825
``
`` @@ -1093,7 +1099,7 @@ HELP: to skip test's attempt to check tidiness, pass --skip src/tools/tidy to
``
1093
1099
`}
`
1094
1100
``
1095
1101
` builder.info("tidy check");
`
1096
``
`-
builder.run_delaying_failure(&mut cmd);
`
``
1102
`+
builder.run_tracked(BootstrapCommand::from(&mut cmd).delay_failure());
`
1097
1103
``
1098
1104
` builder.info("x.py completions check");
`
1099
1105
`let [bash, zsh, fish, powershell] = ["x.py.sh", "x.py.zsh", "x.py.fish", "x.py.ps1"]
`
`@@ -2179,7 +2185,8 @@ impl BookTest {
`
2179
2185
` compiler.host,
`
2180
2186
`);
`
2181
2187
`let _time = helpers::timeit(builder);
`
2182
``
`-
let toolstate = if builder.run_delaying_failure(&mut rustbook_cmd) {
`
``
2188
`+
let cmd = BootstrapCommand::from(&mut rustbook_cmd).delay_failure();
`
``
2189
`+
let toolstate = if builder.run_tracked(cmd).is_success() {
`
2183
2190
`ToolState::TestPass
`
2184
2191
`} else {
`
2185
2192
`ToolState::TestFail
`
`@@ -2371,7 +2378,8 @@ impl Step for RustcGuide {
`
2371
2378
``
2372
2379
`let src = builder.src.join(relative_path);
`
2373
2380
`let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
`
2374
``
`-
let toolstate = if builder.run_delaying_failure(rustbook_cmd.arg("linkcheck").arg(&src)) {
`
``
2381
`+
let cmd = BootstrapCommand::from(rustbook_cmd.arg("linkcheck").arg(&src)).delay_failure();
`
``
2382
`+
let toolstate = if builder.run_tracked(cmd).is_success() {
`
2375
2383
`ToolState::TestPass
`
2376
2384
`} else {
`
2377
2385
`ToolState::TestFail
`
`@@ -2985,7 +2993,7 @@ impl Step for Bootstrap {
`
2985
2993
`.current_dir(builder.src.join("src/bootstrap/"));
`
2986
2994
`// NOTE: we intentionally don't pass test_args here because the args for unittest and cargo test are mutually incompatible.
`
2987
2995
`` // Use python -m unittest manually if you want to pass arguments.
``
2988
``
`-
builder.run_delaying_failure(&mut check_bootstrap);
`
``
2996
`+
builder.run_tracked(BootstrapCommand::from(&mut check_bootstrap).delay_failure());
`
2989
2997
``
2990
2998
`let mut cmd = Command::new(&builder.initial_cargo);
`
2991
2999
` cmd.arg("test")
`
`@@ -3062,7 +3070,7 @@ impl Step for TierCheck {
`
3062
3070
`self.compiler.host,
`
3063
3071
`self.compiler.host,
`
3064
3072
`);
`
3065
``
`-
builder.run_delaying_failure(&mut cargo.into());
`
``
3073
`+
builder.run_tracked(BootstrapCommand::from(&mut cargo.into()).delay_failure());
`
3066
3074
`}
`
3067
3075
`}
`
3068
3076
``
`@@ -3148,7 +3156,7 @@ impl Step for RustInstaller {
`
3148
3156
` cmd.env("CARGO", &builder.initial_cargo);
`
3149
3157
` cmd.env("RUSTC", &builder.initial_rustc);
`
3150
3158
` cmd.env("TMP_DIR", &tmpdir);
`
3151
``
`-
builder.run_delaying_failure(&mut cmd);
`
``
3159
`+
builder.run_tracked(BootstrapCommand::from(&mut cmd).delay_failure());
`
3152
3160
`}
`
3153
3161
``
3154
3162
`fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
`