From d983175189661424c9ef8778d661e63c35a55132 Mon Sep 17 00:00:00 2001
From: "andy.boot" <bootandy@gmail.com>
Date: Sun, 24 Oct 2021 11:58:34 +0100
Subject: [PATCH] Cleanup: Vec -> &[]. Remove println.

---
 src/dir_walker.rs | 18 +++++++++---------
 src/main.rs       |  9 ++-------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/dir_walker.rs b/src/dir_walker.rs
index 85ce955..f40fc64 100644
--- a/src/dir_walker.rs
+++ b/src/dir_walker.rs
@@ -18,10 +18,10 @@ use std::fs::DirEntry;
 
 use crate::platform::get_metadata;
 
-pub struct WalkData {
+pub struct WalkData<'a> {
     pub ignore_directories: HashSet<PathBuf>,
-    pub filter_regex: Vec<Regex>,
-    pub invert_filter_regex: Vec<Regex>,
+    pub filter_regex: &'a [Regex],
+    pub invert_filter_regex: &'a [Regex],
     pub allowed_filesystems: HashSet<u64>,
     pub use_apparent_size: bool,
     pub by_filecount: bool,
@@ -93,14 +93,14 @@ fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
     // Keeping `walk_data.filter_regex.is_empty()` is important for performance reasons, it stops unnecessary work
     if !walk_data.filter_regex.is_empty()
         && entry.path().is_file()
-        && is_filtered_out_due_to_regex(&walk_data.filter_regex, &entry.path())
+        && is_filtered_out_due_to_regex(walk_data.filter_regex, &entry.path())
     {
         return true;
     }
 
     if !walk_data.invert_filter_regex.is_empty()
         && entry.path().is_file()
-        && is_filtered_out_due_to_invert_regex(&walk_data.invert_filter_regex, &entry.path())
+        && is_filtered_out_due_to_invert_regex(walk_data.invert_filter_regex, &entry.path())
     {
         return true;
     }
@@ -131,8 +131,8 @@ fn walk(dir: PathBuf, permissions_flag: &AtomicBool, walk_data: &WalkData) -> Op
                             return build_node(
                                 entry.path(),
                                 vec![],
-                                &walk_data.filter_regex,
-                                &walk_data.invert_filter_regex,
+                                walk_data.filter_regex,
+                                walk_data.invert_filter_regex,
                                 walk_data.use_apparent_size,
                                 data.is_symlink(),
                                 data.is_file(),
@@ -152,8 +152,8 @@ fn walk(dir: PathBuf, permissions_flag: &AtomicBool, walk_data: &WalkData) -> Op
     build_node(
         dir,
         children,
-        &walk_data.filter_regex,
-        &walk_data.invert_filter_regex,
+        walk_data.filter_regex,
+        walk_data.invert_filter_regex,
         walk_data.use_apparent_size,
         false,
         false,
diff --git a/src/main.rs b/src/main.rs
index c170028..70728c5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -273,11 +273,6 @@ fn main() {
         }
     };
 
-    if options.is_present("filter") {
-        println!("Filtering by: {:?}", filter_regexs);
-    }
-    // todo incl invert regex
-
     let ignored_full_path: HashSet<PathBuf> = ignore_directories
         .into_iter()
         .flat_map(|x| simplified_dirs.iter().map(move |d| d.join(x.clone())))
@@ -285,8 +280,8 @@ fn main() {
 
     let walk_data = WalkData {
         ignore_directories: ignored_full_path,
-        filter_regex: filter_regexs,
-        invert_filter_regex: invert_filter_regexs,
+        filter_regex: &filter_regexs,
+        invert_filter_regex: &invert_filter_regexs,
         allowed_filesystems,
         use_apparent_size,
         by_filecount,