uutils · sylvestre · Jul 5, 2021 · Jul 5, 2021 · Jul 5, 2021
diff --git a/src/find/matchers/logical_matchers.rs b/src/find/matchers/logical_matchers.rs
@@ -11,7 +11,7 @@
 //! to "-foo -o ( -bar -baz )", not "( -foo -o -bar ) -baz").
 use std::error::Error;
 use std::iter::Iterator;
-use std::path::PathBuf;
+use std::path::Path;
 use walkdir::DirEntry;
 
 use super::{Matcher, MatcherIO};
@@ -44,7 +44,7 @@ impl Matcher for AndMatcher {
         self.submatchers.iter().any(|x| x.has_side_effects())
     }
 
-    fn finished_dir(&self, dir: &PathBuf) {
+    fn finished_dir(&self, dir: &Path) {
         for m in &self.submatchers {
             m.finished_dir(dir);
         }
@@ -113,7 +113,7 @@ impl Matcher for OrMatcher {
         self.submatchers.iter().any(|x| x.has_side_effects())
     }
 
-    fn finished_dir(&self, dir: &PathBuf) {
+    fn finished_dir(&self, dir: &Path) {
         for m in &self.submatchers {
             m.finished_dir(dir);
         }
@@ -204,7 +204,7 @@ impl Matcher for ListMatcher {
         self.submatchers.iter().any(|x| x.has_side_effects())
     }
 
-    fn finished_dir(&self, dir: &PathBuf) {
+    fn finished_dir(&self, dir: &Path) {
         for m in &self.submatchers {
             m.finished_dir(dir);
         }
@@ -342,7 +342,7 @@ impl Matcher for NotMatcher {
         self.submatcher.has_side_effects()
     }
 
-    fn finished_dir(&self, dir: &PathBuf) {
+    fn finished_dir(&self, dir: &Path) {
         self.submatcher.finished_dir(dir);
     }
 

diff --git a/src/find/matchers/mod.rs b/src/find/matchers/mod.rs
@@ -17,7 +17,7 @@ mod type_matcher;
 
 use regex::Regex;
 use std::error::Error;
-use std::path::PathBuf;
+use std::path::Path;
 use std::time::SystemTime;
 use walkdir::DirEntry;
 
@@ -70,7 +70,7 @@ pub trait Matcher {
     }
 
     /// Notification that find has finished processing a given directory.
-    fn finished_dir(&self, _finished_directory: &PathBuf) {}
+    fn finished_dir(&self, _finished_directory: &Path) {}
 
     /// Notification that find has finished processing all directories -
     /// allowing for any cleanup that isn't suitable for destructors (e.g.

diff --git a/src/find/matchers/time.rs b/src/find/matchers/time.rs
@@ -134,8 +134,8 @@ impl FileTimeMatcher {
 
     pub fn new(file_time_type: FileTimeType, days: ComparableValue) -> FileTimeMatcher {
         FileTimeMatcher {
-            file_time_type,
             days,
+            file_time_type,
         }
     }