Skip to content

Commit 03d48dd

Browse files
committed
Rename Supress variant
1 parent 17011d0 commit 03d48dd

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/bootstrap/src/lib.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -937,14 +937,18 @@ impl Build {
937937

938938
/// Runs a command, printing out nice contextual information if it fails.
939939
fn run_quiet(&self, cmd: &mut Command) {
940-
self.run_cmd(BootstrapCommand::from(cmd).fail_fast().output_mode(OutputMode::Suppress));
940+
self.run_cmd(
941+
BootstrapCommand::from(cmd).fail_fast().output_mode(OutputMode::SuppressOnSuccess),
942+
);
941943
}
942944

943945
/// Runs a command, printing out nice contextual information if it fails.
944946
/// Exits if the command failed to execute at all, otherwise returns its
945947
/// `status.success()`.
946948
fn run_quiet_delaying_failure(&self, cmd: &mut Command) -> bool {
947-
self.run_cmd(BootstrapCommand::from(cmd).delay_failure().output_mode(OutputMode::Suppress))
949+
self.run_cmd(
950+
BootstrapCommand::from(cmd).delay_failure().output_mode(OutputMode::SuppressOnSuccess),
951+
)
948952
}
949953

950954
/// A centralized function for running commands that do not return output.
@@ -965,7 +969,7 @@ impl Build {
965969
}),
966970
matches!(mode, OutputMode::PrintAll),
967971
),
968-
OutputMode::Suppress => (command.command.output(), true),
972+
OutputMode::SuppressOnSuccess => (command.command.output(), true),
969973
};
970974

971975
let output = match output {

src/bootstrap/src/utils/exec.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub enum OutputMode {
1818
/// Print the output (by inheriting stdout/stderr).
1919
PrintOutput,
2020
/// Suppress the output if the command succeeds, otherwise print the output.
21-
Suppress,
21+
SuppressOnSuccess,
2222
}
2323

2424
/// Wrapper around `std::process::Command`.
@@ -43,6 +43,6 @@ impl<'a> BootstrapCommand<'a> {
4343

4444
impl<'a> From<&'a mut Command> for BootstrapCommand<'a> {
4545
fn from(command: &'a mut Command) -> Self {
46-
Self { command, failure_behavior: None, output_mode: OutputMode::Suppress }
46+
Self { command, failure_behavior: None, output_mode: OutputMode::SuppressOnSuccess }
4747
}
4848
}

0 commit comments

Comments
 (0)