Move Color into the display module

7 files changed, 6 insertions, 5 deletions

diff --git a/src/config/config.rs b/src/config/config.rs
index 62cce63..92e8155 100644
--- a/src/config/config.rs
+++ b/src/config/config.rs
@@ -1,6 +1,6 @@
-use crate::color::Color;
 use crate::config::utils::{editor_from_env, get_bool, get_color, get_input, get_string, open_git_config};
 use crate::config::Theme;
+use crate::display::Color;
 use std::convert::TryFrom;
 
 #[derive(Clone, Debug)]
diff --git a/src/config/theme.rs b/src/config/theme.rs
index b611ae7..e655c1a 100644
--- a/src/config/theme.rs
+++ b/src/config/theme.rs
@@ -1,4 +1,4 @@
-use crate::color::Color;
+use crate::display::Color;
 
 #[derive(Clone, Debug)]
 pub struct Theme {
diff --git a/src/config/utils.rs b/src/config/utils.rs
index 8befdc4..5251549 100644
--- a/src/config/utils.rs
+++ b/src/config/utils.rs
@@ -1,4 +1,4 @@
-use crate::color::Color;
+use crate::display::Color;
 use std::convert::TryFrom;
 use std::env;
 
diff --git a/src/color.rs b/src/display/color.rs
index a47e312..a47e312 100644
--- a/src/color.rs
+++ b/src/display/color.rs
diff --git a/src/display/curses.rs b/src/display/curses.rs
index 491247b..4f03a63 100644
--- a/src/display/curses.rs
+++ b/src/display/curses.rs
@@ -1,4 +1,4 @@
-use crate::color::Color;
+use crate::display::Color;
 use pancurses::{
 	chtype,
 	Input,
diff --git a/src/display/mod.rs b/src/display/mod.rs
index 2168c79..5968399 100644
--- a/src/display/mod.rs
+++ b/src/display/mod.rs
@@ -1,9 +1,11 @@
+mod color;
 mod color_manager;
 mod curses;
 #[allow(clippy::module_inception)]
 mod display;
 mod display_color;
 
+pub use self::color::Color;
 pub use self::curses::Curses;
 pub use self::display::Display;
 pub use self::display_color::DisplayColor;
diff --git a/src/main.rs b/src/main.rs
index f09f7b3..6fefa9e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,7 +3,6 @@
 
 mod action;
 mod cli;
-mod color;
 mod commit;
 mod config;
 mod confirm_abort;