Remove run_quiet_delaying_failure

Kobzol · Kobzol · commit e933cfb13ce6 · 2024-06-20T11:43:42.000+02:00
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
@@ -2342,11 +2342,11 @@ fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) ->
     let test_args = builder.config.test_args().join(" ");
     cmd.arg("--test-args").arg(test_args);
 
-    if builder.config.verbose_tests {
-        builder.run_delaying_failure(&mut cmd)
-    } else {
-        builder.run_quiet_delaying_failure(&mut cmd)
+    let mut cmd = BootstrapCommand::from(&mut cmd).delay_failure();
+    if !builder.config.verbose_tests {
+        cmd = cmd.quiet();
     }
+    builder.run_tracked(cmd).is_success()
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
@@ -958,6 +958,7 @@ impl Build {
         })
     }
 
+    /// Execute a command and return its output.
     fn run_tracked(&self, command: BootstrapCommand<'_>) -> CommandOutput {
         if self.config.dry_run() {
             return CommandOutput::default();
@@ -1037,15 +1038,6 @@ impl Build {
         ))
     }
 
-    /// Runs a command, printing out nice contextual information if it fails.
-    /// Exits if the command failed to execute at all, otherwise returns its
-    /// `status.success()`.
-    fn run_quiet_delaying_failure(&self, cmd: &mut Command) -> bool {
-        self.run_cmd(
-            BootstrapCommand::from(cmd).delay_failure().output_mode(OutputMode::PrintOnFailure),
-        )
-    }
-
     /// A centralized function for running commands that do not return output.
     pub(crate) fn run_cmd<'a, C: Into<BootstrapCommand<'a>>>(&self, cmd: C) -> bool {
         if self.config.dry_run() {
diff --git a/src/bootstrap/src/utils/exec.rs b/src/bootstrap/src/utils/exec.rs
@@ -44,6 +44,11 @@ impl<'a> BootstrapCommand<'a> {
         Self { failure_behavior: BehaviorOnFailure::Ignore, ..self }
     }
 
+    /// Do not print the output of the command, unless it fails.
+    pub fn quiet(self) -> Self {
+        self.output_mode(OutputMode::PrintOnFailure)
+    }
+
     pub fn output_mode(self, output_mode: OutputMode) -> Self {
         Self { output_mode, ..self }
     }

Original file line number	Diff line number	Diff line change
`@@ -2342,11 +2342,11 @@ fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) ->`
`2342`	`2342`	`let test_args = builder.config.test_args().join(" ");`
`2343`	`2343`	`cmd.arg("--test-args").arg(test_args);`
`2344`	`2344`
`2345`		`- if builder.config.verbose_tests {`
`2346`		`- builder.run_delaying_failure(&mut cmd)`
`2347`		`- } else {`
`2348`		`- builder.run_quiet_delaying_failure(&mut cmd)`
	`2345`	`+ let mut cmd = BootstrapCommand::from(&mut cmd).delay_failure();`
	`2346`	`+ if !builder.config.verbose_tests {`
	`2347`	`+ cmd = cmd.quiet();`
`2349`	`2348`	`}`
	`2349`	`+ builder.run_tracked(cmd).is_success()`
`2350`	`2350`	`}`
`2351`	`2351`
`2352`	`2352`	`#[derive(Debug, Clone, PartialEq, Eq, Hash)]`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,11 @@ impl<'a> BootstrapCommand<'a> {`
`44`	`44`	`Self { failure_behavior: BehaviorOnFailure::Ignore, ..self }`
`45`	`45`	`}`
`46`	`46`
	`47`	`+ /// Do not print the output of the command, unless it fails.`
	`48`	`+ pub fn quiet(self) -> Self {`
	`49`	`+ self.output_mode(OutputMode::PrintOnFailure)`
	`50`	`+ }`
	`51`	`+`
`47`	`52`	`pub fn output_mode(self, output_mode: OutputMode) -> Self {`
`48`	`53`	`Self { output_mode, ..self }`
`49`	`54`	`}`