about summary refs log tree commit diff
diff options
context:
space:
mode:
authorvarkor <github@varkor.com>2018-05-11 17:04:50 +0100
committerMark Simulacrum <mark.simulacrum@gmail.com>2018-05-12 08:39:05 -0600
commitae41d6c32fb5177a4ef4974cbad0ed16a9b0ec67 (patch)
tree3c7e12801b6db4b284e343665ff0e734b0769d30
parent9d690d40d08026065feb52bee8c88b411381bcaa (diff)
downloadrust-ae41d6c32fb5177a4ef4974cbad0ed16a9b0ec67.tar.gz
rust-ae41d6c32fb5177a4ef4974cbad0ed16a9b0ec67.zip
Ignore non .rs files for tidy libcoretest
Previously, any file would be read, which is both unnecessary, and causes issues if irrelevant non-Unicode files were read (e.g. `.DS_STORE`).
-rw-r--r--src/tools/tidy/src/libcoretest.rs15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/tools/tidy/src/libcoretest.rs b/src/tools/tidy/src/libcoretest.rs
index ef8b55186b1..f6864c7f84e 100644
--- a/src/tools/tidy/src/libcoretest.rs
+++ b/src/tools/tidy/src/libcoretest.rs
@@ -22,12 +22,15 @@ pub fn check(path: &Path, bad: &mut bool) {
         &libcore_path,
         &mut |subpath| t!(subpath.strip_prefix(&libcore_path)).starts_with("tests"),
         &mut |subpath| {
-            if t!(read_to_string(subpath)).contains("#[test]") {
-                tidy_error!(
-                    bad,
-                    "{} contains #[test]; libcore tests must be placed inside `src/libcore/tests/`",
-                    subpath.display()
-                );
+            if subpath.ends_with(".rs") {
+                if t!(read_to_string(subpath)).contains("#[test]") {
+                    tidy_error!(
+                        bad,
+                        "{} contains #[test]; libcore tests must be placed inside \
+                        `src/libcore/tests/`",
+                        subpath.display()
+                    );
+                }
             }
         },
     );