Fix max-depth and depth interpretation

yaa110 · Apr 27, 2021 · f08db6c · f08db6c
1 parent 1b0bddb
commit f08db6c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 name = "nomino"
 readme = "README.md"
 repository = "https://github.com/yaa110/nomino"
-version = "1.0.0"
+version = "1.0.1"
 
 [dependencies]
 atty = "0.2"

diff --git a/src/input/iterator.rs b/src/input/iterator.rs
@@ -61,22 +61,14 @@ impl InputIterator {
         }
 
         if let Source::Regex(re, depth, max_depth) = source {
-            let depth = if let Some(max_depth) = max_depth {
-                if max_depth < depth {
-                    max_depth
-                } else {
-                    depth
-                }
-            } else {
-                depth
-            };
+            let max_depth = max_depth.unwrap_or(depth);
             return Ok(Self::DirectoryIterator {
                 formatter,
                 re,
                 preserve_extension,
                 iter: WalkDir::new(".")
-                    .min_depth(depth)
-                    .max_depth(depth)
+                    .min_depth(if depth > max_depth { max_depth } else { depth })
+                    .max_depth(max_depth)
                     .into_iter(),
             });
         }