mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #103956 - JakobDegen:tidy-bless, r=jyn514

Browse Source 
Make mir opt unused file check blessable

Makes it slightly nicer to work with.

Can't write automated test but tested locally via

```
$ touch src/test/mir-opt/random
$ x test tidy // shows failure
$ x test tidy --bless // file gone
```

r? `@jyn514`
This commit is contained in:
Matthias Krüger 2022-11-05 00:02:05 +01:00 committed by GitHub
commit b1a47d2fd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/tools/tidy/src/mir_opt_tests.rs
View File

@ -3,7 +3,7 @@
use std::collections::HashSet; use std::collections::HashSet;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
fn check_unused_files(path: &Path, bad: &mut bool) { fn check_unused_files(path: &Path, bless: bool, bad: &mut bool) {
let mut rs_files = Vec::<PathBuf>::new(); let mut rs_files = Vec::<PathBuf>::new();
let mut output_files = HashSet::<PathBuf>::new(); let mut output_files = HashSet::<PathBuf>::new();
let files = walkdir::WalkDir::new(&path.join("test/mir-opt")).into_iter(); let files = walkdir::WalkDir::new(&path.join("test/mir-opt")).into_iter();
@ -27,11 +27,15 @@ fn check_unused_files(path: &Path, bad: &mut bool) {
for extra in output_files { for extra in output_files {
if extra.file_name() != Some("README.md".as_ref()) { if extra.file_name() != Some("README.md".as_ref()) {
tidy_error!( if !bless {
bad, tidy_error!(
"the following output file is not associated with any mir-opt test, you can remove it: {}", bad,
extra.display() "the following output file is not associated with any mir-opt test, you can remove it: {}",
); extra.display()
);
} else {
let _ = std::fs::remove_file(extra);
}
} }
} }
} }
@ -65,6 +69,6 @@ fn check_dash_files(path: &Path, bless: bool, bad: &mut bool) {
} }
pub fn check(path: &Path, bless: bool, bad: &mut bool) { pub fn check(path: &Path, bless: bool, bad: &mut bool) {
check_unused_files(path, bad); check_unused_files(path, bless, bad);
check_dash_files(path, bless, bad); check_dash_files(path, bless, bad);
} }