Skip to content

Commit 0179aac

Browse files
authored
Rollup merge of rust-lang#96196 - jyn514:no-assertion, r=Mark-Simulacrum
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.
2 parents 1e43aae + b4ca065 commit 0179aac

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/bootstrap/builder.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -388,11 +388,13 @@ impl<'a> ShouldRun<'a> {
388388
paths
389389
.iter()
390390
.map(|p| {
391-
assert!(
392-
self.builder.src.join(p).exists(),
393-
"`should_run.paths` should correspond to real on-disk paths - use `alias` if there is no relevant path: {}",
394-
p
395-
);
391+
// FIXME(#96188): make sure this is actually a path.
392+
// This currently breaks for paths within submodules.
393+
//assert!(
394+
// self.builder.src.join(p).exists(),
395+
// "`should_run.paths` should correspond to real on-disk paths - use `alias` if there is no relevant path: {}",
396+
// p
397+
//);
396398
TaskPath { path: p.into(), kind: Some(self.kind) }
397399
})
398400
.collect(),

0 commit comments

Comments
 (0)