about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoshua Nelson <jnelson@cloudflare.com>2022-04-18 20:21:19 -0500
committerJoshua Nelson <jnelson@cloudflare.com>2022-04-18 20:21:19 -0500
commitb4ca06558a51cf421be98e1dbb8285c7b32f6450 (patch)
tree3f5943218e479786fa313b23d988753009fed3ef
parent311e2683e1bad87715b1558f7900e294d24ce491 (diff)
downloadrust-b4ca06558a51cf421be98e1dbb8285c7b32f6450.tar.gz
rust-b4ca06558a51cf421be98e1dbb8285c7b32f6450.zip
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.
-rw-r--r--src/bootstrap/builder.rs12
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(),