diff --git a/src/display.rs b/src/display.rs index ac005de..ed11bf8 100644 --- a/src/display.rs +++ b/src/display.rs @@ -39,7 +39,7 @@ impl DisplayData { (true, true, true) => "┌─┴", (true, true, false) => "┌──", (true, false, true) => "├─┴", - (true, _, _) => "├──", + (true, false, false) => "├──", (false, true, true) => "└─┬", (false, true, false) => "└──", (false, false, true) => "├─┬", diff --git a/src/utils/mod.rs b/src/utils/mod.rs index 7d63f0b..b50a606 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -52,13 +52,12 @@ impl Node { } pub fn get_children_from_node(&self, is_reversed: bool) -> impl Iterator { - let children = self.children.clone(); if is_reversed { - let children: Vec = children.into_iter().rev().collect(); - return children.into_iter(); + let children: Vec = self.children.clone().into_iter().rev().collect(); + children.into_iter() + } else { + self.children.clone().into_iter() } - - children.into_iter() } } @@ -147,9 +146,8 @@ pub fn get_dir_tree>( let path = p.path(); let parts = path.components().collect::>(); for d in dirs { - let seq = d.components().collect::>(); if parts - .windows(seq.len()) + .windows(d.components().count()) .any(|window| window.iter().collect::() == *d) { return WalkState::Continue;