From d5ca49462aa830c2c29b82e03eee667b2dbe084a Mon Sep 17 00:00:00 2001
From: Ben Bridle <ben@derelict.engineering>
Date: Mon, 3 Feb 2025 09:45:46 +1300
Subject: Move ANSI escape code constants to a separate module

This is to prevent the codes from polluting the main namespace when
glob-importing from the log crate.
---
 src/lib.rs | 48 +++++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/lib.rs b/src/lib.rs
index 5777fcd..b461af7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,12 +4,14 @@ pub use log_level::*;
 use std::sync::Mutex;
 
 
-pub const NORMAL: &str = "\x1b[0m";
-pub const BOLD:   &str = "\x1b[1m";
-pub const WHITE:  &str = "\x1b[37m";
-pub const RED:    &str = "\x1b[31m";
-pub const YELLOW: &str = "\x1b[33m";
-pub const BLUE:   &str = "\x1b[34m";
+pub mod ansi {
+    pub const NORMAL: &str = "\x1b[0m";
+    pub const BOLD:   &str = "\x1b[1m";
+    pub const WHITE:  &str = "\x1b[37m";
+    pub const RED:    &str = "\x1b[31m";
+    pub const YELLOW: &str = "\x1b[33m";
+    pub const BLUE:   &str = "\x1b[34m";
+}
 
 
 pub static LOG_LEVEL: Mutex<LogLevel> = Mutex::new(LogLevel::Warn);
@@ -27,13 +29,13 @@ pub fn get_log_level() -> LogLevel {
     ($($tokens:tt)*) => {
         if *$crate::LOG_LEVEL.lock().unwrap() <= { $crate::LogLevel::Info } {
             eprint!("{}{}[INFO]{}: ",
-                $crate::BOLD,
-                $crate::BLUE,
-                $crate::NORMAL,
+                $crate::ansi::BOLD,
+                $crate::ansi::BLUE,
+                $crate::ansi::NORMAL,
             );
             eprint!($($tokens)*);
             eprintln!("{}",
-                $crate::NORMAL,
+                $crate::ansi::NORMAL,
             );
         }
     };
@@ -43,14 +45,14 @@ pub fn get_log_level() -> LogLevel {
     ($($tokens:tt)*) => {{
         if *$crate::LOG_LEVEL.lock().unwrap() <= { $crate::LogLevel::Warn } {
             eprint!("{}{}[WARNING]{}{}: ",
-                $crate::BOLD,
-                $crate::YELLOW,
-                $crate::NORMAL,
-                $crate::WHITE,
+                $crate::ansi::BOLD,
+                $crate::ansi::YELLOW,
+                $crate::ansi::NORMAL,
+                $crate::ansi::WHITE,
             );
             eprint!($($tokens)*);
             eprintln!("{}",
-                $crate::NORMAL,
+                $crate::ansi::NORMAL,
             );
         }
     }};
@@ -60,14 +62,14 @@ pub fn get_log_level() -> LogLevel {
     ($($tokens:tt)*) => {{
         if *$crate::LOG_LEVEL.lock().unwrap() <= { $crate::LogLevel::Error } {
             eprint!("{}{}[ERROR]{}: ",
-                $crate::BOLD,
-                $crate::RED,
-                $crate::WHITE,
+                $crate::ansi::BOLD,
+                $crate::ansi::RED,
+                $crate::ansi::WHITE,
 
             );
             eprint!($($tokens)*);
             eprintln!("{}",
-                $crate::NORMAL,
+                $crate::ansi::NORMAL,
             );
         }
     }};
@@ -77,13 +79,13 @@ pub fn get_log_level() -> LogLevel {
     ($($tokens:tt)*) => {{
         if *$crate::LOG_LEVEL.lock().unwrap() <= { $crate::LogLevel::Fatal } {
             eprint!("{}{}[FATAL]{}: ",
-                $crate::BOLD,
-                $crate::RED,
-                $crate::WHITE,
+                $crate::ansi::BOLD,
+                $crate::ansi::RED,
+                $crate::ansi::WHITE,
             );
             eprint!($($tokens)*);
             eprintln!("{}",
-                $crate::NORMAL,
+                $crate::ansi::NORMAL,
             );
         }
         std::process::exit(1);
-- 
cgit v1.2.3-70-g09d2