Appease clippy · rust-lang/rust@3fe4d13 (original) (raw)

`@@ -585,8 +585,8 @@ impl Build {

`

585

585

`BootstrapCommand::from(submodule_git().args(["diff-index", "--quiet", "HEAD"]))

`

586

586

`.allow_failure()

`

587

587

`.output_mode(match self.is_verbose() {

`

588

``

`-

true => OutputMode::PrintAll,

`

589

``

`-

false => OutputMode::PrintOutput,

`

``

588

`+

true => OutputMode::All,

`

``

589

`+

false => OutputMode::OnlyOutput,

`

590

590

`}),

`

591

591

`);

`

592

592

`if has_local_modifications {

`

`@@ -967,15 +967,15 @@ impl Build {

`

967

967

`self.verbose(|| println!("running: {command:?}"));

`

968

968

``

969

969

`let output_mode = command.output_mode.unwrap_or_else(|| match self.is_verbose() {

`

970

``

`-

true => OutputMode::PrintAll,

`

971

``

`-

false => OutputMode::PrintOutput,

`

``

970

`+

true => OutputMode::All,

`

``

971

`+

false => OutputMode::OnlyOutput,

`

972

972

`});

`

973

973

`let (output, print_error): (io::Result, bool) = match output_mode {

`

974

``

`-

mode @ (OutputMode::PrintAll | OutputMode::PrintOutput) => (

`

``

974

`+

mode @ (OutputMode::All | OutputMode::OnlyOutput) => (

`

975

975

` command.command.status().map(|status| status.into()),

`

976

``

`-

matches!(mode, OutputMode::PrintAll),

`

``

976

`+

matches!(mode, OutputMode::All),

`

977

977

`),

`

978

``

`-

OutputMode::PrintOnFailure => (command.command.output().map(|o| o.into()), true),

`

``

978

`+

OutputMode::OnlyOnFailure => (command.command.output().map(|o| o.into()), true),

`

979

979

`};

`

980

980

``

981

981

`let output = match output {

`

`@@ -1026,8 +1026,8 @@ impl Build {

`

1026

1026

`fn run(&self, cmd: &mut Command) {

`

1027

1027

`self.run_cmd(BootstrapCommand::from(cmd).fail_fast().output_mode(

`

1028

1028

`match self.is_verbose() {

`

1029

``

`-

true => OutputMode::PrintAll,

`

1030

``

`-

false => OutputMode::PrintOutput,

`

``

1029

`+

true => OutputMode::All,

`

``

1030

`+

false => OutputMode::OnlyOutput,

`

1031

1031

`},

`

1032

1032

`));

`

1033

1033

`}

`