diff options
| author | bors <bors@rust-lang.org> | 2022-04-21 02:16:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-21 02:16:32 +0000 |
| commit | 7be1da0319eb5f381bc0aa8559367bb33dfe90a5 (patch) | |
| tree | a57975815305ff26cbdfde1e7bb87748a4698025 /src/bootstrap | |
| parent | 09ccb6c59d026b94edae50ba949b22dfc5d65ed1 (diff) | |
| parent | 463c94a780c642c9ceae00bb24a001ab1a16dca2 (diff) | |
| download | rust-7be1da0319eb5f381bc0aa8559367bb33dfe90a5.tar.gz rust-7be1da0319eb5f381bc0aa8559367bb33dfe90a5.zip | |
Auto merge of #96263 - Dylan-DPC:rollup-0eofl13, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #90630 (Create real parser for search queries) - #96193 ([fuchsia] Add implementation for `current_exe`) - #96196 (Remove assertion that all paths in `ShouldRun` exist) - #96228 (Fix locations for intrinsics impls and change to links) - #96236 (Add an explicit `Span` field to `OutlivesConstraint`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/builder.rs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index d688f798956..965e66880f4 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -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(), |