diff options
author | Tim Oram <dev@mitmaro.ca> | 2019-12-27 11:03:43 -0330 |
---|---|---|
committer | Tim Oram <dev@mitmaro.ca> | 2019-12-27 11:33:17 -0330 |
commit | 21e94176b42a097401858b54282020e68772a36b (patch) | |
tree | 35cd6d82ba9b077d2212b0c35cab6e104a0e7d86 | |
parent | 9ff7a3d8c02d1450f6e8858c814f89bd7c42cf73 (diff) |
Move Line into list module
-rw-r--r-- | src/git_interactive.rs | 2 | ||||
-rw-r--r-- | src/list/line.rs (renamed from src/line.rs) | 0 | ||||
-rw-r--r-- | src/list/list.rs | 2 | ||||
-rw-r--r-- | src/list/mod.rs | 2 | ||||
-rw-r--r-- | src/main.rs | 1 |
5 files changed, 4 insertions, 3 deletions
diff --git a/src/git_interactive.rs b/src/git_interactive.rs index 8bef646..0c785d2 100644 --- a/src/git_interactive.rs +++ b/src/git_interactive.rs @@ -6,7 +6,7 @@ use std::path::PathBuf; use crate::action::Action; use crate::commit::Commit; -use crate::line::Line; +use crate::list::Line; fn load_filepath(path: &PathBuf, config_comment_char: &str) -> Result<Vec<Line>, String> { let mut file = match File::open(&path) { diff --git a/src/line.rs b/src/list/line.rs index d031d77..d031d77 100644 --- a/src/line.rs +++ b/src/list/line.rs diff --git a/src/list/list.rs b/src/list/list.rs index a81b9d4..68949dc 100644 --- a/src/list/list.rs +++ b/src/list/list.rs @@ -4,7 +4,6 @@ use crate::constants::MINIMUM_FULL_WINDOW_WIDTH; use crate::display::DisplayColor; use crate::git_interactive::GitInteractive; use crate::input::{Input, InputHandler}; -use crate::line::Line; use crate::list::utils::{ get_action_color, get_normal_footer_compact, @@ -12,6 +11,7 @@ use crate::list::utils::{ get_visual_footer_compact, get_visual_footer_full, }; +use crate::list::Line; use crate::process::{ExitStatus, HandleInputResult, HandleInputResultBuilder, ProcessModule, ProcessResult, State}; use crate::scroll::ScrollPosition; use crate::view::{LineSegment, View, ViewLine}; diff --git a/src/list/mod.rs b/src/list/mod.rs index b428df8..413f574 100644 --- a/src/list/mod.rs +++ b/src/list/mod.rs @@ -1,6 +1,8 @@ +mod line; #[allow(clippy::module_inception)] mod list; mod utils; +pub use self::line::Line; pub use self::list::List; pub use self::utils::get_action_color; diff --git a/src/main.rs b/src/main.rs index 6fefa9e..d21e9ee 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,7 +16,6 @@ mod external_editor; mod git_interactive; mod help; mod input; -mod line; mod list; mod process; mod scroll; |