Skip dirs specified in gitignore (#574)

Take ignored dirs into consideration when calculating diff

Co-authored-by: Nimrod <[email protected]>

.gitignore

@@ -2,6 +2,7 @@
 **/*.rs.bk
 perf.data*
 flamegraph.svg
+.idea
 
 sample_files/compare.result
 

Cargo.toml

@@ -55,7 +55,7 @@ mimalloc = { version = "0.1.28", default-features = false }
 # large textual files, as discussed in #297.
 libmimalloc-sys = "=0.1.24"
 radix-heap = "0.4.2"
-walkdir = "2.3.3"
+ignore = "0.3.1"
 const_format = "0.2.22"
 owo-colors = "3.5.0"
 wu-diff = "0.1.2"

src/files.rs

@@ -7,8 +7,8 @@ use std::{
     path::{Path, PathBuf},
 };
 
+use ignore::Walk;
 use rustc_hash::FxHashSet;
-use walkdir::WalkDir;
 
 use crate::exit_codes::EXIT_BAD_ARGUMENTS;
 use crate::options::FileArgument;
@@ -235,10 +235,10 @@ pub(crate) fn guess_content(bytes: &[u8]) -> ProbableFileKind {
 
 /// All the files in `dir`, including subdirectories.
 fn relative_file_paths_in_dir(dir: &Path) -> Vec<PathBuf> {
-    WalkDir::new(dir)
+    Walk::new(dir)
         .into_iter()
         .filter_map(Result::ok)
-        .map(|entry| entry.into_path())
+        .map(|entry| Path::new(entry.path()).to_owned())
         .filter(|path| !path.is_dir())
         .map(|path| path.strip_prefix(dir).unwrap().to_path_buf())
         .collect()