dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve `run-make/output-type-permutations` code and improve `filename_not_in_denylist` API

This commit is contained in:
Guillaume Gomez 2024-07-07 13:05:07 +02:00
parent 98dcbae5c9
commit 39bb14e34a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tools/run-make-support/src/lib.rs
View File

@ -296,7 +296,8 @@ pub fn not_contains<P: AsRef<Path>>(path: P, expected: &str) -> bool {
}
/// Returns true if the filename at `path` is not in `expected`.
pub fn filename_not_in_denylist<P: AsRef<Path>>(path: P, expected: &[String]) -> bool {
pub fn filename_not_in_denylist<P: AsRef<Path>, V: AsRef<[String]>>(path: P, expected: V) -> bool {
let expected = expected.as_ref();
path.as_ref()
.file_name()
.is_some_and(|name| !expected.contains(&name.to_str().unwrap().to_owned()))

5
tests/run-make/output-type-permutations/rmake.rs
View File

@ -17,9 +17,8 @@ use std::path::PathBuf;
// `rustc_invocation`: the rustc command being tested
// Any unexpected output files not listed in `must_exist` or `can_exist` will cause a failure.
fn assert_expected_output_files(expectations: Expectations, rustc_invocation: impl Fn()) {
let must_exist = expectations.expected_files;
let can_exist = expectations.allowed_files;
let dir = expectations.test_dir;
let Expectations { expected_files: must_exist, allowed_files: can_exist, test_dir: dir } =
expectations;
fs_wrapper::create_dir(&dir);
rustc_invocation();