summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Oram <dev@mitmaro.ca>2021-07-05 11:10:44 -0230
committerTim Oram <dev@mitmaro.ca>2021-07-05 16:27:53 -0230
commit0035e6d342b47e5ac1733bb164689d5bfad460c7 (patch)
tree0455f68650410f46247e1f30bd4aa816795d4ef9
parent7df83d1cc6c292ea0e0d98470986499e35b41ce5 (diff)
Move error module into core
-rw-r--r--src/core/main.rs3
-rw-r--r--src/core/modules/error/mod.rs (renamed from src/error/mod.rs)0
-rw-r--r--src/core/modules/mod.rs3
-rw-r--r--src/core/process/tests.rs2
-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 8392b8f..9caea3d 100644
--- a/src/core/main.rs
+++ b/src/core/main.rs
@@ -13,10 +13,9 @@ use crate::{
arguments::Args,
exit::Exit,
help::build_help,
- modules::{ConfirmAbort, ConfirmRebase},
+ modules::{ConfirmAbort, ConfirmRebase, Error},
process::Process,
},
- error::Error,
external_editor::ExternalEditor,
insert::Insert,
list::List,
diff --git a/src/error/mod.rs b/src/core/modules/error/mod.rs
index dd77eaa..dd77eaa 100644
--- a/src/error/mod.rs
+++ b/src/core/modules/error/mod.rs
diff --git a/src/core/modules/mod.rs b/src/core/modules/mod.rs
index 3f00d15..4d841f9 100644
--- a/src/core/modules/mod.rs
+++ b/src/core/modules/mod.rs
@@ -1,4 +1,5 @@
mod confirm_abort;
mod confirm_rebase;
+mod error;
-pub use self::{confirm_abort::ConfirmAbort, confirm_rebase::ConfirmRebase};
+pub use self::{confirm_abort::ConfirmAbort, confirm_rebase::ConfirmRebase, error::Error};
diff --git a/src/core/process/tests.rs b/src/core/process/tests.rs
index 75c3910..da05998 100644
--- a/src/core/process/tests.rs
+++ b/src/core/process/tests.rs
@@ -8,7 +8,7 @@ use view::{assert_rendered_output, ViewData};
use super::*;
use crate::{
- error::Error,
+ core::modules::Error,
module::{testutil::module_test, Module},
window_size_error::WindowSizeError,
};
diff --git a/src/main.rs b/src/main.rs
index 34736ef..ab5ba67 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -36,7 +36,6 @@
mod components;
mod core;
-mod error;
mod external_editor;
mod insert;
mod list;