Rework count function without glob

Author: Oneirical

Cargo.lock

@@ -3461,10 +3461,10 @@ name = "run_make_support"
 version = "0.2.0"
 dependencies = [
  "gimli 0.28.1",
- "glob",
  "object 0.34.0",
  "regex",
  "similar",
+ "walkdir",
  "wasmparser",
 ]
 

src/tools/run-make-support/Cargo.toml

@@ -9,4 +9,4 @@ similar = "2.5.0"
 wasmparser = "0.118.2"
 regex = "1.8" # 1.8 to avoid memchr 2.6.0, as 2.5.0 is pinned in the workspace
 gimli = "0.28.1"
-glob = "0.3.1"
+walkdir = "2.5.0"

src/tools/run-make-support/src/lib.rs

@@ -22,9 +22,9 @@ use std::panic;
 use std::path::{Path, PathBuf};
 
 pub use gimli;
-pub use glob;
 pub use object;
 pub use regex;
+pub use walkdir;
 pub use wasmparser;
 
 pub use cc::{cc, extra_c_flags, extra_cxx_flags, Cc};
@@ -245,21 +245,37 @@ pub fn uname() -> String {
     output.stdout_utf8()
 }
 
-/// Inside a glob pattern of files (paths), read their contents and count the
+/// Search for all files in the current working directory with the extension `ext`,
+/// read their contents and count the
 /// number of regex matches with a given expression (re).
 #[track_caller]
-pub fn count_regex_matches_in_file_glob(re: &str, paths: &str) -> usize {
-    let re = regex::Regex::new(re).expect(format!("Regex expression {re} is not valid.").as_str());
-    let paths = glob::glob(paths).expect(format!("Glob expression {paths} is not valid.").as_str());
-    use io::BufRead;
-    paths
-        .filter_map(|entry| entry.ok())
-        .filter(|entry| entry.as_path().is_file())
-        .filter_map(|path| fs::File::open(&path).ok())
-        .map(|file| io::BufReader::new(file))
-        .flat_map(|reader| reader.lines().filter_map(|entry| entry.ok()))
-        .filter(|line| re.is_match(line))
-        .count()
+pub fn count_regex_matches_in_files_with_extension(re: &regex::Regex, ext: &str) -> usize {
+    use std::io::BufRead;
+    use walkdir::{DirEntry, WalkDir};
+
+    let walker = WalkDir::new(cwd()).into_iter();
+
+    fn is_hidden(entry: &DirEntry) -> bool {
+        entry.file_name().to_str().map(|s| s.starts_with(".")).unwrap_or(false)
+    }
+
+    let mut count = 0;
+
+    for entry in walker.filter_entry(|e| !is_hidden(e)) {
+        let entry = entry.expect("failed to get DirEntry");
+        if !entry.path().is_file() {
+            continue;
+        }
+
+        if !entry.path().extension().is_some_and(|e| e == ext) {
+            continue;
+        }
+
+        let content = fs_wrapper::read(entry.path());
+        count += content.lines().filter(|line| re.is_match(&line.as_ref().unwrap())).count();
+    }
+
+    count
 }
 
 fn handle_failed_output(cmd: &Command, output: CompletedProcess, caller_line_number: u32) -> ! {

tests/run-make/sepcomp-cci-copies/rmake.rs

@@ -4,10 +4,11 @@
 // created for each source module (see `rustc_const_eval::monomorphize::partitioning`).
 // See https://github.com/rust-lang/rust/pull/16367
 
-use run_make_support::{count_regex_matches_in_file_glob, rustc};
+use run_make_support::{count_regex_matches_in_files_with_extension, regex, rustc};
 
 fn main() {
     rustc().input("cci_lib.rs").run();
     rustc().input("foo.rs").emit("llvm-ir").codegen_units(6).arg("-Zinline-in-all-cgus").run();
-    assert_eq!(count_regex_matches_in_file_glob(r#"define\ .*cci_fn"#, "foo.*.ll"), 2);
+    let re = regex::Regex::new(r#"define\ .*cci_fn"#).unwrap();
+    assert_eq!(count_regex_matches_in_files_with_extension(&re, "ll"), 2);
 }

tests/run-make/sepcomp-inlining/rmake.rs

@@ -5,15 +5,16 @@
 // in only one compilation unit.
 // See https://github.com/rust-lang/rust/pull/16367
 
-use run_make_support::{count_regex_matches_in_file_glob, glob, regex, rustc};
+use run_make_support::{count_regex_matches_in_files_with_extension, regex, rustc};
 
 fn main() {
     rustc().input("foo.rs").emit("llvm-ir").codegen_units(3).arg("-Zinline-in-all-cgus").run();
-    assert_eq!(count_regex_matches_in_file_glob(r#"define\ i32\ .*inlined"#, "foo.*.ll"), 0);
-    assert_eq!(count_regex_matches_in_file_glob(r#"define\ internal\ .*inlined"#, "foo.*.ll"), 2);
-    assert_eq!(count_regex_matches_in_file_glob(r#"define\ hidden\ i32\ .*normal"#, "foo.*.ll"), 1);
-    assert_eq!(
-        count_regex_matches_in_file_glob(r#"declare\ hidden\ i32\ .*normal"#, "foo.*.ll"),
-        2
-    );
+    let re = regex::Regex::new(r#"define\ i32\ .*inlined"#).unwrap();
+    assert_eq!(count_regex_matches_in_files_with_extension(&re, "ll"), 0);
+    let re = regex::Regex::new(r#"define\ internal\ .*inlined"#).unwrap();
+    assert_eq!(count_regex_matches_in_files_with_extension(&re, "ll"), 2);
+    let re = regex::Regex::new(r#"define\ hidden\ i32\ .*normal"#).unwrap();
+    assert_eq!(count_regex_matches_in_files_with_extension(&re, "ll"), 1);
+    let re = regex::Regex::new(r#"declare\ hidden\ i32\ .*normal"#).unwrap();
+    assert_eq!(count_regex_matches_in_files_with_extension(&re, "ll"), 2);
 }

tests/run-make/sepcomp-separate/rmake.rs

@@ -3,9 +3,10 @@
 // wind up in three different compilation units.
 // See https://github.com/rust-lang/rust/pull/16367
 
-use run_make_support::{count_regex_matches_in_file_glob, rustc};
+use run_make_support::{count_regex_matches_in_files_with_extension, regex, rustc};
 
 fn main() {
     rustc().input("foo.rs").emit("llvm-ir").codegen_units(3).run();
-    assert_eq!(count_regex_matches_in_file_glob(r#"define\ .*magic_fn"#, "foo.*.ll"), 3);
+    let re = regex::Regex::new(r#"define\ .*magic_fn"#).unwrap();
+    assert_eq!(count_regex_matches_in_files_with_extension(&re, "ll"), 3);
 }