diff options
author | Piotr Wach <pwach@bloomberg.net> | 2023-12-19 21:12:28 +0000 |
---|---|---|
committer | Piotr Wach <pwach@bloomberg.net> | 2023-12-19 21:14:19 +0000 |
commit | 49aecb9245054446ac1b338ea1cc29831e72d5e0 (patch) | |
tree | da5d7f2475c35fc98c9eff3ebdddbfcbb2df3634 | |
parent | 7244bac0fc51697ed6be6597dee82a26da222c23 (diff) |
Small code review fixes
-rw-r--r-- | src/interactive/app/eventloop.rs | 11 | ||||
-rw-r--r-- | src/interactive/app/handlers.rs | 4 | ||||
-rw-r--r-- | src/interactive/app/tests/unit.rs | 2 | ||||
-rw-r--r-- | src/interactive/mod.rs | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/src/interactive/app/eventloop.rs b/src/interactive/app/eventloop.rs index 5e1694f..1379811 100644 --- a/src/interactive/app/eventloop.rs +++ b/src/interactive/app/eventloop.rs @@ -244,11 +244,10 @@ impl AppState { let glob_tree_view = GlobTreeView { traversal: tree_view.traversal_as_mut(), - glob_tree_root: tree_root + glob_tree_root: tree_root, }; - let new_entries = - glob_tree_view.sorted_entries(tree_root, self.sorting); + let new_entries = glob_tree_view.sorted_entries(tree_root, self.sorting); let new_entries = self .navigation_mut() @@ -300,15 +299,13 @@ impl AppState { window.glob_pane = None; let normal_tree_view = NormalTreeView { - traversal: tree_view.traversal_as_mut() + traversal: tree_view.traversal_as_mut(), }; let new_entries = self.navigation().selected.map(|previously_selected| { ( previously_selected, - normal_tree_view.sorted_entries( - self.navigation().view_root, - self.sorting), + normal_tree_view.sorted_entries(self.navigation().view_root, self.sorting), ) }); self.enter_node(new_entries); diff --git a/src/interactive/app/handlers.rs b/src/interactive/app/handlers.rs index 3367bf3..ee98298 100644 --- a/src/interactive/app/handlers.rs +++ b/src/interactive/app/handlers.rs @@ -115,8 +115,8 @@ impl AppState { } pub fn change_entry_selection(&mut self, direction: CursorDirection) { - let nex_index = self.navigation().get_next_index(direction, &self.entries); - self.navigation_mut().select(nex_index); + let next_index = self.navigation().get_next_index(direction, &self.entries); + self.navigation_mut().select(next_index); } pub fn cycle_sorting(&mut self, tree_view: &dyn TreeView) { diff --git a/src/interactive/app/tests/unit.rs b/src/interactive/app/tests/unit.rs index 28e9191..95fa223 100644 --- a/src/interactive/app/tests/unit.rs +++ b/src/interactive/app/tests/unit.rs @@ -33,7 +33,7 @@ fn it_can_handle_ending_traversal_without_reaching_the_top() -> Result<()> { } #[test] -fn glob_pattern() { +fn it_can_do_a_glob_search() { let (tree, root_index) = sample_02_tree(); let result = glob_search(&tree, root_index, "tests/fixtures/sample-02").unwrap(); let expected = vec![TreeIndex::from(1)]; diff --git a/src/interactive/mod.rs b/src/interactive/mod.rs index 39733c4..8cff501 100644 --- a/src/interactive/mod.rs +++ b/src/interactive/mod.rs @@ -36,5 +36,5 @@ mod utils { }) } } + pub use utils::path_of; -// pub use utils::glob_path_of; |