diff options
| -rw-r--r-- | src/common.rs | 5 | ||||
| -rw-r--r-- | src/interactive/app.rs | 2 | ||||
| -rw-r--r-- | src/interactive/mod.rs | 2 | ||||
| -rw-r--r-- | src/interactive/widgets.rs | 8 | ||||
| -rw-r--r-- | src/lib.rs | 2 | ||||
| -rw-r--r-- | src/traverse.rs (renamed from src/interactive/traverse.rs) | 0 | ||||
| -rw-r--r-- | tests/interactive.rs | 3 |
7 files changed, 14 insertions, 8 deletions
diff --git a/src/common.rs b/src/common.rs index 43c67f7..dbcad2d 100644 --- a/src/common.rs +++ b/src/common.rs @@ -1,4 +1,7 @@ -use crate::interactive::{widgets::SortMode, EntryData, Tree, TreeIndex}; +use crate::{ + interactive::widgets::SortMode, + traverse::{EntryData, Tree, TreeIndex}, +}; use itertools::Itertools; use jwalk::WalkDir; use petgraph::Direction; diff --git a/src/interactive/app.rs b/src/interactive/app.rs index 139283c..a8642d5 100644 --- a/src/interactive/app.rs +++ b/src/interactive/app.rs @@ -1,5 +1,5 @@ use super::widgets::{DisplayState, MainWindow}; -use crate::{interactive::Traversal, sorted_entries, ByteFormat, WalkOptions, WalkResult}; +use crate::{sorted_entries, traverse::Traversal, ByteFormat, WalkOptions, WalkResult}; use failure::Error; use itertools::Itertools; use petgraph::Direction; diff --git a/src/interactive/mod.rs b/src/interactive/mod.rs index 040fd10..ae1d34e 100644 --- a/src/interactive/mod.rs +++ b/src/interactive/mod.rs @@ -1,6 +1,4 @@ mod app; -mod traverse; pub mod widgets; pub use self::app::*; -pub use self::traverse::*; diff --git a/src/interactive/widgets.rs b/src/interactive/widgets.rs index 0e0a58d..4356d04 100644 --- a/src/interactive/widgets.rs +++ b/src/interactive/widgets.rs @@ -1,5 +1,9 @@ -use super::{DisplayOptions, Traversal, Tree, TreeIndex}; -use crate::{get_entry_or_panic, sorted_entries, ByteFormat}; +use super::DisplayOptions; +use crate::{ + get_entry_or_panic, sorted_entries, + traverse::{Traversal, Tree, TreeIndex}, + ByteFormat, +}; use std::path::PathBuf; use tui::layout::{Constraint, Direction, Layout}; use tui::style::{Color, Style}; @@ -3,7 +3,9 @@ extern crate jwalk; mod aggregate; mod common; + pub mod interactive; +pub mod traverse; pub use aggregate::aggregate; pub use common::*; diff --git a/src/interactive/traverse.rs b/src/traverse.rs index 9c2501c..9c2501c 100644 --- a/src/interactive/traverse.rs +++ b/src/traverse.rs diff --git a/tests/interactive.rs b/tests/interactive.rs index e21a092..52ee7ad 100644 --- a/tests/interactive.rs +++ b/tests/interactive.rs @@ -204,8 +204,7 @@ mod app { app.process_events(&mut terminal, b"ju".keys())?; { assert_eq!( - app.traversal.root_index, - app.state.root, + app.traversal.root_index, app.state.root, "it keeps the root - it can't go further up" ); assert_eq!( |