perf: remove unnecessary clones and Option

1 files changed, 15 insertions, 22 deletions

diff --git a/src/paths.rs b/src/paths.rs
index de6a2dd..719eec4 100644
--- a/src/paths.rs
+++ b/src/paths.rs
@@ -8,52 +8,45 @@ pub use error::Error;
 mod config;
 mod error;
 
-#[derive(Default)]
 pub struct Paths {
-    path_entries: Vec<PathEntry>,
-    paths_iter: Option<IntoIter<PathEntry>>,
+    paths_iter: IntoIter<PathEntry>,
     iter: Option<Walk>,
 }
 
 impl Paths {
     pub fn new(path_entries: Vec<PathEntry>) -> Self {
         Self {
-            path_entries,
-            ..Default::default()
+            paths_iter: path_entries.into_iter(),
+            iter: None,
         }
     }
 }
 
 impl From<&Config> for Paths {
     fn from(value: &Config) -> Self {
-        Paths {
-            path_entries: value.paths.to_owned(),
-            ..Default::default()
-        }
+        Self::new(value.paths.to_owned())
     }
 }
 
 impl Iterator for Paths {
     type Item = PathBuf;
 
+    #[tracing::instrument(skip(self))]
     fn next(&mut self) -> Option<Self::Item> {
         loop {
             match self.iter.as_mut().and_then(|iter| iter.next()) {
                 Some(Ok(d)) => return Some(d.into_path()),
                 Some(Err(err)) => warn!("{:?}", err),
-                None => match self.paths_iter.as_mut() {
-                    Some(paths_iter) => {
-                        let next = paths_iter.next()?;
-                        self.iter = Some(
-                            WalkBuilder::new(next.path)
-                                .standard_filters(true)
-                                .max_depth(next.recurse)
-                                .hidden(next.hidden)
-                                .build(),
-                        );
-                    }
-                    None => self.paths_iter = Some(self.path_entries.to_owned().into_iter()),
-                },
+                None => {
+                    let next = self.paths_iter.next()?;
+                    self.iter = Some(
+                        WalkBuilder::new(next.path)
+                            .standard_filters(true)
+                            .max_depth(next.recurse)
+                            .hidden(next.hidden)
+                            .build(),
+                    );
+                }
             };
         }
     }