diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-04-21 01:14:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-21 01:14:15 +0200 |
| commit | 0179aacfc1d1e5086edacc0aee1e21b753645a13 (patch) | |
| tree | 10486bc84496e32323dca3c60a9cbcb25872cacc /src | |
| parent | 1e43aae0ef1dfb4d5ec470990dfedda201ad18ad (diff) | |
| parent | b4ca06558a51cf421be98e1dbb8285c7b32f6450 (diff) | |
| download | rust-0179aacfc1d1e5086edacc0aee1e21b753645a13.tar.gz rust-0179aacfc1d1e5086edacc0aee1e21b753645a13.zip | |
Rollup merge of #96196 - jyn514:no-assertion, r=Mark-Simulacrum
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.
Diffstat (limited to 'src')
| -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(), |