@@ -180,9 +180,7 @@ You can skip linkcheck with --exclude src/tools/linkchecker"
180
180
let _guard =
181
181
builder. msg ( Kind :: Test , compiler. stage , "Linkcheck" , bootstrap_host, bootstrap_host) ;
182
182
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" ) ) ) ;
186
184
}
187
185
188
186
fn should_run ( run : ShouldRun < ' _ > ) -> ShouldRun < ' _ > {
@@ -235,7 +233,9 @@ impl Step for HtmlCheck {
235
233
builder. default_doc ( & [ ] ) ;
236
234
builder. ensure ( crate :: doc:: Rustc :: new ( builder. top_stage , self . target , builder) ) ;
237
235
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
+ ) ;
239
239
}
240
240
}
241
241
@@ -274,7 +274,7 @@ impl Step for Cargotest {
274
274
275
275
let _time = util:: timeit ( & builder) ;
276
276
let mut cmd = builder. tool_cmd ( Tool :: CargoTest ) ;
277
- builder. try_run (
277
+ builder. run_delaying_failure (
278
278
cmd. arg ( & cargo)
279
279
. arg ( & out_dir)
280
280
. args ( builder. config . test_args ( ) )
@@ -876,7 +876,7 @@ impl Step for RustdocTheme {
876
876
util:: lld_flag_no_threads ( self . compiler . host . contains ( "windows" ) ) ,
877
877
) ;
878
878
}
879
- builder. try_run ( & mut cmd) ;
879
+ builder. run_delaying_failure ( & mut cmd) ;
880
880
}
881
881
}
882
882
@@ -1136,7 +1136,7 @@ help: to skip test's attempt to check tidiness, pass `--exclude src/tools/tidy`
1136
1136
}
1137
1137
1138
1138
builder. info ( "tidy check" ) ;
1139
- builder. try_run ( & mut cmd) ;
1139
+ builder. run_delaying_failure ( & mut cmd) ;
1140
1140
1141
1141
builder. ensure ( ExpandYamlAnchors ) ;
1142
1142
@@ -1181,7 +1181,7 @@ impl Step for ExpandYamlAnchors {
1181
1181
/// by the user before committing CI changes.
1182
1182
fn run ( self , builder : & Builder < ' _ > ) {
1183
1183
builder. info ( "Ensuring the YAML anchors in the GitHub Actions config were expanded" ) ;
1184
- builder. try_run (
1184
+ builder. run_delaying_failure (
1185
1185
& mut builder. tool_cmd ( Tool :: ExpandYamlAnchors ) . arg ( "check" ) . arg ( & builder. src ) ,
1186
1186
) ;
1187
1187
}
@@ -1970,7 +1970,7 @@ impl BookTest {
1970
1970
compiler. host ,
1971
1971
) ;
1972
1972
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) {
1974
1974
ToolState :: TestPass
1975
1975
} else {
1976
1976
ToolState :: TestFail
@@ -2132,7 +2132,7 @@ fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) ->
2132
2132
cmd. arg ( "--test-args" ) . arg ( test_args) ;
2133
2133
2134
2134
if builder. config . verbose_tests {
2135
- builder. try_run ( & mut cmd)
2135
+ builder. run_delaying_failure ( & mut cmd)
2136
2136
} else {
2137
2137
try_run_quiet ( builder, & mut cmd)
2138
2138
}
@@ -2160,7 +2160,7 @@ impl Step for RustcGuide {
2160
2160
2161
2161
let src = builder. src . join ( relative_path) ;
2162
2162
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) ) {
2164
2164
ToolState :: TestPass
2165
2165
} else {
2166
2166
ToolState :: TestFail
@@ -2713,7 +2713,7 @@ impl Step for Bootstrap {
2713
2713
. current_dir ( builder. src . join ( "src/bootstrap/" ) ) ;
2714
2714
// NOTE: we intentionally don't pass test_args here because the args for unittest and cargo test are mutually incompatible.
2715
2715
// 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) ;
2717
2717
2718
2718
let mut cmd = Command :: new ( & builder. initial_cargo ) ;
2719
2719
cmd. arg ( "test" )
@@ -2789,7 +2789,7 @@ impl Step for TierCheck {
2789
2789
self . compiler . host ,
2790
2790
self . compiler . host ,
2791
2791
) ;
2792
- builder. try_run ( & mut cargo. into ( ) ) ;
2792
+ builder. run_delaying_failure ( & mut cargo. into ( ) ) ;
2793
2793
}
2794
2794
}
2795
2795
@@ -2875,7 +2875,7 @@ impl Step for RustInstaller {
2875
2875
cmd. env ( "CARGO" , & builder. initial_cargo ) ;
2876
2876
cmd. env ( "RUSTC" , & builder. initial_rustc ) ;
2877
2877
cmd. env ( "TMP_DIR" , & tmpdir) ;
2878
- builder. try_run ( & mut cmd) ;
2878
+ builder. run_delaying_failure ( & mut cmd) ;
2879
2879
}
2880
2880
2881
2881
fn should_run ( run : ShouldRun < ' _ > ) -> ShouldRun < ' _ > {
0 commit comments