mirror of https://github.com/rust-lang/rust.git
Rollup merge of #113551 - jyn514:dry-run-exclude, r=ozkanonur
bootstrap: Don't print "Skipping" twice Bootstrap executes itself twice: once with DryRun::SelfCheck and DryRun::Disabled. Change it not to print the "Skipping" message if SelfCheck is enabled. See https://github.com/rust-lang/rust/actions/runs/5503931599/jobs/10029625567?pr=113514#step:24:772.
This commit is contained in:
commit
40b1c5b716
|
@ -13,7 +13,7 @@ use std::process::Command;
|
||||||
use std::time::{Duration, Instant};
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
use crate::cache::{Cache, Interned, INTERNER};
|
use crate::cache::{Cache, Interned, INTERNER};
|
||||||
use crate::config::{SplitDebuginfo, TargetSelection};
|
use crate::config::{DryRun, SplitDebuginfo, TargetSelection};
|
||||||
use crate::doc;
|
use crate::doc;
|
||||||
use crate::flags::{Color, Subcommand};
|
use crate::flags::{Color, Subcommand};
|
||||||
use crate::install;
|
use crate::install;
|
||||||
|
@ -281,11 +281,15 @@ impl StepDescription {
|
||||||
|
|
||||||
fn is_excluded(&self, builder: &Builder<'_>, pathset: &PathSet) -> bool {
|
fn is_excluded(&self, builder: &Builder<'_>, pathset: &PathSet) -> bool {
|
||||||
if builder.config.exclude.iter().any(|e| pathset.has(&e, builder.kind)) {
|
if builder.config.exclude.iter().any(|e| pathset.has(&e, builder.kind)) {
|
||||||
println!("Skipping {:?} because it is excluded", pathset);
|
if !matches!(builder.config.dry_run, DryRun::SelfCheck) {
|
||||||
|
println!("Skipping {:?} because it is excluded", pathset);
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if !builder.config.exclude.is_empty() {
|
if !builder.config.exclude.is_empty()
|
||||||
|
&& !matches!(builder.config.dry_run, DryRun::SelfCheck)
|
||||||
|
{
|
||||||
builder.verbose(&format!(
|
builder.verbose(&format!(
|
||||||
"{:?} not skipped for {:?} -- not in {:?}",
|
"{:?} not skipped for {:?} -- not in {:?}",
|
||||||
pathset, self.name, builder.config.exclude
|
pathset, self.name, builder.config.exclude
|
||||||
|
|
Loading…
Reference in New Issue