Skip to content

Rustbuild: attempt to match path without /src/* #86459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Rustbuild: attempt to match path without /src/* #86459

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/bootstrap/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,13 @@ impl StepDescription {
}

fn run(v: &[StepDescription], builder: &Builder<'_>, paths: &[PathBuf]) {
let should_runs =
v.iter().map(|desc| (desc.should_run)(ShouldRun::new(builder))).collect::<Vec<_>>();
let should_runs = v
.iter()
.map(|desc| (desc, (desc.should_run)(ShouldRun::new(builder))))
.collect::<Vec<_>>();

// sanity checks on rules
for (desc, should_run) in v.iter().zip(&should_runs) {
for (desc, should_run) in should_runs.iter() {
assert!(
!should_run.paths.is_empty(),
"{:?} should have at least one pathset",
Expand All @@ -196,7 +198,7 @@ impl StepDescription {
}

if paths.is_empty() || builder.config.include_default_paths {
for (desc, should_run) in v.iter().zip(&should_runs) {
for (desc, should_run) in should_runs.iter() {
if desc.default && should_run.is_really_default() {
for pathset in &should_run.paths {
desc.maybe_run(builder, pathset);
Expand All @@ -213,7 +215,7 @@ impl StepDescription {
};

let mut attempted_run = false;
for (desc, should_run) in v.iter().zip(&should_runs) {
for (desc, should_run) in should_runs.iter() {
if let Some(suite) = should_run.is_suite_path(path) {
attempted_run = true;
desc.maybe_run(builder, suite);
Expand Down