diff --git a/maid/client/helpers/mod.rs b/maid/client/helpers/mod.rs deleted file mode 100644 index cbcf28ec0ba73e0a6c15886b5a4dbd6a86233139..0000000000000000000000000000000000000000 --- a/maid/client/helpers/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub(crate) mod logger; diff --git a/maid/client/main.rs b/maid/client/main.rs index f493e1a33466419cdcedae84e94c6b2fba604c8b..4c7f0edc0e3c7a84d4dba8a57e39ede2a0f3579b 100644 --- a/maid/client/main.rs +++ b/maid/client/main.rs @@ -1,6 +1,5 @@ mod cli; mod globals; -mod helpers; mod parse; mod server; mod shell; diff --git a/maid/client/helpers/logger.rs b/maid/client/server/logger.rs similarity index 100% rename from maid/client/helpers/logger.rs rename to maid/client/server/logger.rs diff --git a/maid/client/server/mod.rs b/maid/client/server/mod.rs index b0a1e381d59c4270fc4311f75c71deb128e51759..fa04cc0646c71462c39440b51009466c01f2b6af 100644 --- a/maid/client/server/mod.rs +++ b/maid/client/server/mod.rs @@ -1,4 +1,5 @@ -pub mod api; -pub mod cli; -pub mod file; -pub mod parse; +pub(crate) mod api; +pub(crate) mod cli; +pub(crate) mod file; +pub(crate) mod logger; +pub(crate) mod parse; diff --git a/maid/server/helpers/logger.rs b/maid/server/helpers/logger.rs deleted file mode 100644 index 992efb157cdfd9627ca317254988cccb33c17622..0000000000000000000000000000000000000000 --- a/maid/server/helpers/logger.rs +++ /dev/null @@ -1,25 +0,0 @@ -#[macro_export] -macro_rules! log { - ($level:expr, $($arg:tt)*) => { - let level_colors: std::collections::HashMap<&str, (&str, &str)> = [ - ("fatal", ("FATAL", "bright red")), - ("error", ("ERROR", "red")), - ("warning", ("WARN", "yellow")), - ("success", ("SUCCESS", "green")), - ("notice", ("NOTICE", "bright blue")), - ("info", ("INFO", "cyan")), - ("debug", ("DEBUG", "magenta")), - ] - .iter() - .cloned() - .collect(); - - match level_colors.get($level) { - Some((level_text, color_func)) => { - let level_text = level_text.color(color_func.to_string()); - println!("{} {}", level_text, format_args!($($arg)*).to_string()) - } - None => println!("Unknown log level: {}", $level), - } - }; -} diff --git a/maid/server/helpers/mod.rs b/maid/server/helpers/mod.rs index fb8c6f9ded9de353855f9a5d18a6c879a4e2beb1..62f120c856f781d578baf54cbdac9b2cdf785b26 100644 --- a/maid/server/helpers/mod.rs +++ b/maid/server/helpers/mod.rs @@ -1,3 +1,2 @@ pub mod format; -pub mod logger; pub mod os;