Merge #941

941: replace walkdir with ripgreps ignore crate r=Alexhuszagh a=Emilgardis



Co-authored-by: Emil Gardström <[email protected]>

Author: bors[bot]

.github/actions/setup-rust/action.yml

@@ -15,6 +15,10 @@ inputs:
 runs:
   using: composite
   steps:
+    # Work around for sporadic issues with rustup self-update on windows
+    - run: rustup set auto-self-update disable
+      if: contains(runner.os, 'windows')
+      shell: bash
     - name: Install Rust toolchain
       uses: actions-rs/toolchain@v1
       with:

Cargo.lock

@@ -63,7 +63,7 @@ lto = true
 [dev-dependencies]
 regex = "1"
 once_cell = "1"
-walkdir = "2"
+ignore = "0.4"
 
 [package.metadata.release]
 dev-version = false

Cargo.toml

@@ -32,10 +32,12 @@ main() {
     # shellcheck disable=SC2016
     echo '#!/usr/bin/env bash
 export CROSS_CUSTOM_TOOLCHAIN=1
-exec "${CROSS}" run --target '"${TARGET}" > bisect.sh
+"${CROSS}" run --target '"${TARGET}"'
+cargo -V | grep 2022-06
+' > bisect.sh
     chmod +x bisect.sh
 
-    if ! err=$(cargo bisect-rustc --script=./bisect.sh --target "${TARGET}" 2>&1 >/dev/null); then
+    if ! err=$(cargo bisect-rustc --start 2022-07-01 --end 2022-07-03 --script=./bisect.sh --target "${TARGET}" 2>&1); then
         if [[ "${err}" != *"does not reproduce the regression"* ]]; then
             echo "${err}"
             exit 1

ci/test-bisect.sh

@@ -27,23 +27,23 @@ pub fn get_cargo_workspace() -> &'static Path {
 
 pub fn walk_dir<'a>(
     root: &'_ Path,
-    skip: &'a [impl AsRef<OsStr>],
-    ext: impl for<'s> Fn(Option<&'s std::ffi::OsStr>) -> bool + 'static,
-) -> impl Iterator<Item = Result<walkdir::DirEntry, walkdir::Error>> + 'a {
-    walkdir::WalkDir::new(root)
-        .into_iter()
+    skip: &'static [impl AsRef<OsStr> + Send + Sync + 'a],
+    ext: impl for<'s> Fn(Option<&'s std::ffi::OsStr>) -> bool + Sync + Send + 'static,
+) -> impl Iterator<Item = Result<ignore::DirEntry, ignore::Error>> {
+    ignore::WalkBuilder::new(root)
         .filter_entry(move |e| {
             if skip
                 .iter()
                 .map(|s| -> &std::ffi::OsStr { s.as_ref() })
                 .any(|dir| e.file_name() == dir)
             {
                 return false;
-            } else if e.file_type().is_dir() {
+            } else if e.file_type().map_or(false, |f| f.is_dir()) {
                 return true;
             }
             ext(e.path().extension())
         })
+        .build()
 }
 
 #[test]
@@ -134,9 +134,10 @@ release: {version}
 fn check_newlines() -> crate::Result<()> {
     for file in walk_dir(get_cargo_workspace(), &[".git", "target"], |_| true) {
         let file = file?;
-        if !file.file_type().is_file() {
+        if !file.file_type().map_or(true, |f| f.is_file()) {
             continue;
         }
+        eprintln!("File: {:?}", file.path());
         assert!(
             crate::file::read(file.path())
                 .unwrap_or_else(|_| String::from("\n"))

src/tests.rs

@@ -30,7 +30,7 @@ fn toml_check() -> Result<(), Box<dyn std::error::Error>> {
 
     for dir_entry in walk {
         let dir_entry = dir_entry?;
-        if dir_entry.file_type().is_dir() {
+        if dir_entry.file_type().map_or(true, |f| f.is_dir()) {
             continue;
         }
         eprintln!("File: {:?}", dir_entry.path());