about summary refs log tree commit diff
path: root/src/bootstrap/run.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/bootstrap/run.rs')
-rw-r--r--src/bootstrap/run.rs19
1 files changed, 2 insertions, 17 deletions
diff --git a/src/bootstrap/run.rs b/src/bootstrap/run.rs
index c97b7592737..4082f5bb9b1 100644
--- a/src/bootstrap/run.rs
+++ b/src/bootstrap/run.rs
@@ -24,11 +24,9 @@ impl Step for ExpandYamlAnchors {
     /// anchors in them, since GitHub Actions doesn't support them.
     fn run(self, builder: &Builder<'_>) {
         builder.info("Expanding YAML anchors in the GitHub Actions configuration");
-        try_run(
-            builder,
+        builder.run_delaying_failure(
             &mut builder.tool_cmd(Tool::ExpandYamlAnchors).arg("generate").arg(&builder.src),
-        )
-        .unwrap();
+        );
     }
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
@@ -40,19 +38,6 @@ impl Step for ExpandYamlAnchors {
     }
 }
 
-fn try_run(builder: &Builder<'_>, cmd: &mut Command) -> Result<(), ()> {
-    if !builder.fail_fast {
-        if let Err(e) = builder.try_run(cmd) {
-            let mut failures = builder.delayed_failures.borrow_mut();
-            failures.push(format!("{:?}", cmd));
-            return Err(e);
-        }
-    } else {
-        builder.run(cmd);
-    }
-    Ok(())
-}
-
 #[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
 pub struct BuildManifest;