Auto merge of #7316 - lengyijun:rc_mutex, r=llogiq

[rust.git] / clippy_dev / src / stderr_length_check.rs

diff --git a/clippy_dev/src/stderr_length_check.rs b/clippy_dev/src/stderr_length_check.rs
index 2d7d119f3ff125fe558d19c142eca19f5aa22513..e02b6f7da5f7b66e7653403d2f823984eb000ce4 100644 (file)
--- a/clippy_dev/src/stderr_length_check.rs
+++ b/clippy_dev/src/stderr_length_check.rs
@@ -1,54 +1,51 @@
+use crate::clippy_project_root;
 use std::ffi::OsStr;
+use std::fs;
+use std::path::{Path, PathBuf};
 use walkdir::WalkDir;
 
-use std::fs::File;
-use std::io::prelude::*;
-
 // The maximum length allowed for stderr files.
 //
 // We limit this because small files are easier to deal with than bigger files.
-const LIMIT: usize = 275;
+const LENGTH_LIMIT: usize = 200;
 
 pub fn check() {
-    let stderr_files = stderr_files();
-    let exceeding_files = exceeding_stderr_files(stderr_files).collect::<Vec<String>>();
+    let exceeding_files: Vec<_> = exceeding_stderr_files();
 
     if !exceeding_files.is_empty() {
-        eprintln!("Error: stderr files exceeding limit of {} lines:", LIMIT);
-        for path in exceeding_files {
-            println!("{}", path);
+        eprintln!("Error: stderr files exceeding limit of {} lines:", LENGTH_LIMIT);
+        for (path, count) in exceeding_files {
+            println!("{}: {}", path.display(), count);
         }
         std::process::exit(1);
     }
 }
 
-fn exceeding_stderr_files(files: impl Iterator<Item = walkdir::DirEntry>) -> impl Iterator<Item = String> {
-    files.filter_map(|file| {
-        let path = file.path().to_str().expect("Could not convert path to str").to_string();
-        let linecount = count_linenumbers(&path);
-        if linecount > LIMIT {
-            Some(path)
-        } else {
-            None
-        }
-    })
-}
-
-fn stderr_files() -> impl Iterator<Item = walkdir::DirEntry> {
+fn exceeding_stderr_files() -> Vec<(PathBuf, usize)> {
     // We use `WalkDir` instead of `fs::read_dir` here in order to recurse into subdirectories.
-    WalkDir::new("../tests/ui")
+    WalkDir::new(clippy_project_root().join("tests/ui"))
         .into_iter()
-        .filter_map(std::result::Result::ok)
-        .filter(|f| f.path().extension() == Some(OsStr::new("stderr")))
+        .filter_map(Result::ok)
+        .filter(|f| !f.file_type().is_dir())
+        .filter_map(|e| {
+            let p = e.into_path();
+            let count = count_linenumbers(&p);
+            if p.extension() == Some(OsStr::new("stderr")) && count > LENGTH_LIMIT {
+                Some((p, count))
+            } else {
+                None
+            }
+        })
+        .collect()
 }
 
 #[must_use]
-fn count_linenumbers(filepath: &str) -> usize {
-    if let Ok(mut file) = File::open(filepath) {
-        let mut content = String::new();
-        file.read_to_string(&mut content).expect("Failed to read file?");
-        content.lines().count()
-    } else {
-        0
+fn count_linenumbers(filepath: &Path) -> usize {
+    match fs::read(filepath) {
+        Ok(content) => bytecount::count(&content, b'\n'),
+        Err(e) => {
+            eprintln!("Failed to read file: {}", e);
+            0
+        },
     }
 }