user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify BehaviorOnFailure

Browse source
This commit is contained in:
Jakub Beránek 2023-10-11 19:02:00 +02:00
parent 03d48dd735
commit b153a01828
No known key found for this signature in database
GPG key ID: 909CD0D26483516B
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/bootstrap/src/lib.rs
View file

@ -997,19 +997,18 @@ impl Build {
match result {
Ok(_) => true,
Err(_) => {
if let Some(failure_behavior) = command.failure_behavior {
match failure_behavior {
BehaviorOnFailure::DelayFail => {
let mut failures = self.delayed_failures.borrow_mut();
failures.push(format!("{command:?}"));
}
BehaviorOnFailure::Exit => {
match command.failure_behavior {
BehaviorOnFailure::DelayFail => {
if self.fail_fast {
exit!(1);
}
let mut failures = self.delayed_failures.borrow_mut();
failures.push(format!("{command:?}"));
}
BehaviorOnFailure::Exit => {
exit!(1);
}
}
if self.fail_fast {
exit!(1);
}
false
}

12
src/bootstrap/src/utils/exec.rs
View file

@ -25,16 +25,16 @@ pub enum OutputMode {
#[derive(Debug)]
pub struct BootstrapCommand<'a> {
pub command: &'a mut Command,
pub failure_behavior: Option<BehaviorOnFailure>,
pub failure_behavior: BehaviorOnFailure,
pub output_mode: OutputMode,
}
impl<'a> BootstrapCommand<'a> {
pub fn delay_failure(self) -> Self {
Self { failure_behavior: Some(BehaviorOnFailure::DelayFail), ..self }
Self { failure_behavior: BehaviorOnFailure::DelayFail, ..self }
}
pub fn fail_fast(self) -> Self {
Self { failure_behavior: Some(BehaviorOnFailure::Exit), ..self }
Self { failure_behavior: BehaviorOnFailure::Exit, ..self }
}
pub fn output_mode(self, output_mode: OutputMode) -> Self {
Self { output_mode, ..self }
@ -43,6 +43,10 @@ impl<'a> BootstrapCommand<'a> {
impl<'a> From<&'a mut Command> for BootstrapCommand<'a> {
fn from(command: &'a mut Command) -> Self {
Self { command, failure_behavior: None, output_mode: OutputMode::SuppressOnSuccess }
Self {
command,
failure_behavior: BehaviorOnFailure::Exit,
output_mode: OutputMode::SuppressOnSuccess,
}
}
}