bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #96196 - jyn514:no-assertion, r=Mark-Simulacrum

Browse source 
Remove assertion that all paths in `ShouldRun` exist

This breaks on submodules (see #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.
This commit is contained in:
Dylan DPC 2022-04-21 01:14:15 +02:00 • committed by GitHub
commit 0179aacfc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/bootstrap/builder.rs
View file

@ -388,11 +388,13 @@ impl<'a> ShouldRun<'a> {
paths paths
.iter() .iter()
.map(|p| { .map(|p| {
assert!( // FIXME(#96188): make sure this is actually a path.
self.builder.src.join(p).exists(), // This currently breaks for paths within submodules.
"`should_run.paths` should correspond to real on-disk paths - use `alias` if there is no relevant path: {}", //assert!(
p // 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) } TaskPath { path: p.into(), kind: Some(self.kind) }
}) })
.collect(), .collect(),