summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Oram <dev@mitmaro.ca>2021-07-05 11:37:56 -0230
committerTim Oram <dev@mitmaro.ca>2021-07-05 16:27:53 -0230
commit5de2263890a26d36553fb5a1632746de918a14e1 (patch)
treedc1057d9400a9bd922a2d398d5559c0b63e4c981
parent11629fd4db9a25aedc3a07220b7848fcf0492d1f (diff)
Move window_size_error module to core
-rw-r--r--src/core/main.rs3
-rw-r--r--src/core/modules/mod.rs2
-rw-r--r--src/core/modules/window_size_error/mod.rs (renamed from src/window_size_error/mod.rs)0
-rw-r--r--src/core/process/tests.rs3
-rw-r--r--src/main.rs1
5 files changed, 4 insertions, 5 deletions
diff --git a/src/core/main.rs b/src/core/main.rs
index cb80d74..ffe1359 100644
--- a/src/core/main.rs
+++ b/src/core/main.rs
@@ -13,11 +13,10 @@ use crate::{
arguments::Args,
exit::Exit,
help::build_help,
- modules::{ConfirmAbort, ConfirmRebase, Error, ExternalEditor, Insert, List, ShowCommit},
+ modules::{ConfirmAbort, ConfirmRebase, Error, ExternalEditor, Insert, List, ShowCommit, WindowSizeError},
process::Process,
},
module::{ExitStatus, Modules, State},
- window_size_error::WindowSizeError,
};
pub(super) fn load_config() -> Result<Config, Exit> {
diff --git a/src/core/modules/mod.rs b/src/core/modules/mod.rs
index 0981152..20ac7c1 100644
--- a/src/core/modules/mod.rs
+++ b/src/core/modules/mod.rs
@@ -5,6 +5,7 @@ mod external_editor;
mod insert;
mod list;
mod show_commit;
+mod window_size_error;
pub use self::{
confirm_abort::ConfirmAbort,
@@ -14,4 +15,5 @@ pub use self::{
insert::Insert,
list::List,
show_commit::ShowCommit,
+ window_size_error::WindowSizeError,
};
diff --git a/src/window_size_error/mod.rs b/src/core/modules/window_size_error/mod.rs
index f0730f5..f0730f5 100644
--- a/src/window_size_error/mod.rs
+++ b/src/core/modules/window_size_error/mod.rs
diff --git a/src/core/process/tests.rs b/src/core/process/tests.rs
index da05998..659f801 100644
--- a/src/core/process/tests.rs
+++ b/src/core/process/tests.rs
@@ -8,9 +8,8 @@ use view::{assert_rendered_output, ViewData};
use super::*;
use crate::{
- core::modules::Error,
+ core::modules::{Error, WindowSizeError},
module::{testutil::module_test, Module},
- window_size_error::WindowSizeError,
};
struct TestModule {
diff --git a/src/main.rs b/src/main.rs
index 86e5856..e09eeeb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -38,7 +38,6 @@
mod components;
mod core;
mod module;
-mod window_size_error;
use std::env::args_os;