refactor(rola-cli): replace GeneralRenderer with StructuralRenderer andHEADmaster

use public modules

1 files changed, 5 insertions, 15 deletions

diff --git a/rola-cli/src/error/space.rs b/rola-cli/src/error/space.rs
index fb0a560..b4a011d 100644
--- a/rola-cli/src/error/space.rs
+++ b/rola-cli/src/error/space.rs
@@ -1,26 +1,22 @@
 use mingling::{
     Groupped,
-    macros::{chain, r_println, renderer},
+    macros::{chain, group, r_println, renderer},
     res::ResExitCode,
 };
-use serde::Serialize;
 use space_system::SpaceError;
 
-use crate::{Next, error::ErrorIo, locale::errors::I18nSpaceError};
+use crate::{Next, error::io::ErrorIo, locale::errors::I18nSpaceError};
 
 pub const EC_SPACE_NOT_FOUND: i32 = 2600;
 pub const EC_SPACE_PATH_FORMAT: i32 = 2601;
 pub const EC_SPACE_REQUIRE_EMPTY_DIR: i32 = 2602;
 pub const EC_SPACE_CONFIG_ALREADY_EXIST: i32 = 2603;
 
-#[derive(Serialize, Groupped)]
-pub struct ErrorSpace {
-    pub error: SpaceError,
-}
+group!(ErrorSpace = SpaceError);
 
 #[chain]
 pub fn handle_error_space(err: ErrorSpace) -> Next {
-    match err.error {
+    match err {
         // Forward to ErrorIo
         SpaceError::Io(error) => ErrorIo::from(error).to_render(),
 
@@ -30,7 +26,7 @@ pub fn handle_error_space(err: ErrorSpace) -> Next {
 
 #[renderer]
 pub fn render_error_space(err: ErrorSpace, ec: &mut ResExitCode) {
-    match &err.error {
+    match &err {
         SpaceError::SpaceNotFound => {
             r_println!("{}", I18nSpaceError::space_not_found().trim());
             ec.exit_code = EC_SPACE_NOT_FOUND;
@@ -56,9 +52,3 @@ pub fn render_error_space(err: ErrorSpace, ec: &mut ResExitCode) {
         }
     }
 }
-
-impl From<SpaceError> for ErrorSpace {
-    fn from(error: SpaceError) -> Self {
-        Self { error }
-    }
-}