bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Display the name of the failed file in tidy/libcoretest

Browse source
This commit is contained in:
varkor 2018-05-11 21:36:24 +01:00
parent fd85de1459
commit 16c088d325
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/tools/tidy/src/libcoretest.rs
View file

@ -22,14 +22,21 @@ pub fn check(path: &Path, bad: &mut bool) {
&libcore_path, &libcore_path,
&mut |subpath| t!(subpath.strip_prefix(&libcore_path)).starts_with("tests"), &mut |subpath| t!(subpath.strip_prefix(&libcore_path)).starts_with("tests"),
&mut |subpath| { &mut |subpath| {
if subpath.ends_with(".rs") { if let Some("rs") = subpath.extension().and_then(|e| e.to_str()) {
if t!(read_to_string(subpath)).contains("#[test]") { match read_to_string(subpath) {
tidy_error!( Ok(contents) => {
bad, if contents.contains("#[test]") {
"{} contains #[test]; libcore tests must be placed inside \ tidy_error!(
`src/libcore/tests/`", bad,
subpath.display() "{} contains #[test]; libcore tests must be placed inside \
); `src/libcore/tests/`",
subpath.display()
);
}
}
Err(err) => {
panic!("failed to read file {:?}: {}", subpath, err);
}
} }
} }
}, },