diff options
| author | bors <bors@rust-lang.org> | 2022-04-06 21:15:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-06 21:15:16 +0000 |
| commit | 8f36334ca939a67cce3f37f24953ff6f2d3f3d33 (patch) | |
| tree | a3c11a30dc96000927385cae40f36a194b09ed41 /src/bootstrap | |
| parent | c2afaba465e0bf44b9b37beba8d908b78dcdadc7 (diff) | |
| parent | ebba894f197ac06bfca84d61e11234484ce74773 (diff) | |
Auto merge of #95742 - Dylan-DPC:rollup-8n7o87y, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #95342 (Ignore "format the world" commit in git blame) - #95353 ([bootstrap] Give a hard error when filtering tests for a file that does not exist) - #95649 (New mir-opt deref_separator) - #95721 (Fix typo in bootstrap/setup.rs) - #95730 (Rename RWLock to RwLock in std::sys.) - #95731 (Check that all hidden types are the same and then deduplicate them.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/setup.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/util.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/bootstrap/setup.rs b/src/bootstrap/setup.rs index aff2b6c3cbf..b730730854f 100644 --- a/src/bootstrap/setup.rs +++ b/src/bootstrap/setup.rs @@ -342,7 +342,7 @@ undesirable, simply delete the `pre-push` file from .git/hooks." dst.display(), e ), - Ok(_) => println!("Linked `src/etc/pre-commit.sh` to `.git/hooks/pre-push`"), + Ok(_) => println!("Linked `src/etc/pre-push.sh` to `.git/hooks/pre-push`"), }; } else { println!("Ok, skipping installation!"); diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs index 30d9665dd0f..defb1e4d83b 100644 --- a/src/bootstrap/util.rs +++ b/src/bootstrap/util.rs @@ -308,10 +308,10 @@ pub fn is_valid_test_suite_arg<'a, P: AsRef<Path>>( let abs_path = builder.src.join(path); let exists = abs_path.is_dir() || abs_path.is_file(); if !exists { - if let Some(p) = abs_path.to_str() { - builder.info(&format!("Warning: Skipping \"{}\": not a regular file or directory", p)); - } - return None; + panic!( + "Invalid test suite filter \"{}\": file or directory does not exist", + abs_path.display() + ); } // Since test suite paths are themselves directories, if we don't // specify a directory or file, we'll get an empty string here |