Skip to content

Commit

Permalink
Rollup merge of rust-lang#96196 - jyn514:no-assertion, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Remove assertion that all paths in `ShouldRun` exist

This breaks on submodules (see rust-lang#96188). Disable the assertion for now until I can think of a proper
fix.

This doesn't revert any of the changes in `Step`s themselves, only what
`ShouldRun::paths` does.
  • Loading branch information
Dylan-DPC authored Apr 20, 2022
2 parents 1e43aae + b4ca065 commit 0179aac
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/bootstrap/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -388,11 +388,13 @@ impl<'a> ShouldRun<'a> {
paths
.iter()
.map(|p| {
assert!(
self.builder.src.join(p).exists(),
"`should_run.paths` should correspond to real on-disk paths - use `alias` if there is no relevant path: {}",
p
);
// FIXME(#96188): make sure this is actually a path.
// This currently breaks for paths within submodules.
//assert!(
// self.builder.src.join(p).exists(),
// "`should_run.paths` should correspond to real on-disk paths - use `alias` if there is no relevant path: {}",
// p
//);
TaskPath { path: p.into(), kind: Some(self.kind) }
})
.collect(),
Expand Down

0 comments on commit 0179aac

Please sign in to comment.