diff options
author | Tim Oram <dev@mitmaro.ca> | 2019-10-17 20:32:26 -0230 |
---|---|---|
committer | Tim Oram <dev@mitmaro.ca> | 2019-12-27 12:34:54 -0330 |
commit | 4027d282ae244fcb998ab26d400b88c40f4cac9b (patch) | |
tree | 055019ff160ecaf296144477b55f6c0a1a459e49 | |
parent | 31986a736853acfe2aef5142cff97b40c3d0bf13 (diff) |
Move Action into list
-rw-r--r-- | src/git_interactive.rs | 6 | ||||
-rw-r--r-- | src/list/action.rs (renamed from src/action.rs) | 0 | ||||
-rw-r--r-- | src/list/line.rs | 4 | ||||
-rw-r--r-- | src/list/list.rs | 3 | ||||
-rw-r--r-- | src/list/mod.rs | 2 | ||||
-rw-r--r-- | src/list/utils.rs | 2 | ||||
-rw-r--r-- | src/main.rs | 1 |
7 files changed, 8 insertions, 10 deletions
diff --git a/src/git_interactive.rs b/src/git_interactive.rs index 0c785d2..a75e350 100644 --- a/src/git_interactive.rs +++ b/src/git_interactive.rs @@ -1,13 +1,11 @@ +use crate::commit::Commit; +use crate::list::{Action, Line}; use std::cmp; use std::fs::File; use std::io::Read; use std::io::Write; use std::path::PathBuf; -use crate::action::Action; -use crate::commit::Commit; -use crate::list::Line; - fn load_filepath(path: &PathBuf, config_comment_char: &str) -> Result<Vec<Line>, String> { let mut file = match File::open(&path) { Ok(file) => file, diff --git a/src/action.rs b/src/list/action.rs index dc72af3..dc72af3 100644 --- a/src/action.rs +++ b/src/list/action.rs diff --git a/src/list/line.rs b/src/list/line.rs index d031d77..beb9dc7 100644 --- a/src/list/line.rs +++ b/src/list/line.rs @@ -1,4 +1,4 @@ -use crate::action::Action; +use crate::list::Action; use std::convert::TryFrom; #[derive(Debug, PartialEq)] @@ -119,7 +119,7 @@ impl Line { #[cfg(test)] mod tests { use super::Line; - use crate::action::Action; + use crate::list::Action; #[test] fn new_with_pick_action() { diff --git a/src/list/list.rs b/src/list/list.rs index 68949dc..91557c4 100644 --- a/src/list/list.rs +++ b/src/list/list.rs @@ -1,4 +1,3 @@ -use crate::action::Action; use crate::config::Config; use crate::constants::MINIMUM_FULL_WINDOW_WIDTH; use crate::display::DisplayColor; @@ -11,7 +10,7 @@ use crate::list::utils::{ get_visual_footer_compact, get_visual_footer_full, }; -use crate::list::Line; +use crate::list::{Action, 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 413f574..acb780c 100644 --- a/src/list/mod.rs +++ b/src/list/mod.rs @@ -1,8 +1,10 @@ +mod action; mod line; #[allow(clippy::module_inception)] mod list; mod utils; +pub use self::action::Action; pub use self::line::Line; pub use self::list::List; pub use self::utils::get_action_color; diff --git a/src/list/utils.rs b/src/list/utils.rs index d5a28e2..a1979a5 100644 --- a/src/list/utils.rs +++ b/src/list/utils.rs @@ -1,5 +1,5 @@ -use crate::action::Action; use crate::display::DisplayColor; +use crate::list::Action; use crate::Config; fn get_input_short_name(input: &str) -> String { diff --git a/src/main.rs b/src/main.rs index d21e9ee..9fc5627 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,6 @@ #![cfg_attr(feature = "clippy", feature(plugin))] #![cfg_attr(feature = "clippy", plugin(clippy))] -mod action; mod cli; mod commit; mod config; |