From 2c3962fa998a04d06229a617e0f6a1e62c13dccd Mon Sep 17 00:00:00 2001 From: Michael Mikovsky <77305074+Astatin3@users.noreply.github.com> Date: Wed, 4 Mar 2026 12:22:23 -0700 Subject: [PATCH] Remove warnings from unused colors. --- src/logger/pretty_logger.rs | 25 +++++++++++++------------ ush-payload/src/main.rs | 8 ++++---- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/logger/pretty_logger.rs b/src/logger/pretty_logger.rs index 3cf5101..bcef234 100644 --- a/src/logger/pretty_logger.rs +++ b/src/logger/pretty_logger.rs @@ -4,17 +4,6 @@ pub struct PrettyLogger { output: Option>, } -// static TRACE_COLOR: &str = "\x1b[34m"; -static DEBUG_COLOR: &str = "\x1b[36m"; -static INFO_COLOR: &str = "\x1b[32m"; -static WARN_COLOR: &str = "\x1b[33m"; -static ERROR_COLOR: &str = "\x1b[31m"; - -static WHITE: &str = "\x1b[97m"; -static OFF_WHITE: &str = "\x1b[37m"; -static TIME_COLOR: &str = "\x1b[36m"; -static GREY: &str = "\x1b[90m"; - impl Logger for PrettyLogger { fn log(&self, message: Record) { if let Some(ref func) = self.output { @@ -26,6 +15,11 @@ impl Logger for PrettyLogger { } pub fn log(message: &Record) { + static DEBUG_COLOR: &str = "\x1b[36m"; + static INFO_COLOR: &str = "\x1b[32m"; + static WARN_COLOR: &str = "\x1b[33m"; + static ERROR_COLOR: &str = "\x1b[31m"; + let log_level = match message.log_level { LogLevel::Debug => format!("{DEBUG_COLOR}DBUG"), LogLevel::Info => format!("{INFO_COLOR}INFO"), @@ -35,6 +29,8 @@ pub fn log(message: &Record) { match (message.time, &message.location) { (None, None) => { + static WHITE: &str = "\x1b[97m"; + println!("{} {WHITE}{}", log_level, message.message,); } @@ -44,13 +40,18 @@ pub fn log(message: &Record) { let date: DateTime = time.into(); + static WHITE: &str = "\x1b[97m"; + static OFF_WHITE: &str = "\x1b[37m"; + static TIME_COLOR: &str = "\x1b[36m"; + static GREY: &str = "\x1b[90m"; + println!( "{OFF_WHITE}[{TIME_COLOR}{}{OFF_WHITE}] {} {WHITE}{} {GREY}{}{WHITE}", date, log_level, message.message, location ); } - _ => unreachable!("All debug fields must be present or removed."), + _ => unreachable!("Invalid log configuration"), } } diff --git a/ush-payload/src/main.rs b/ush-payload/src/main.rs index a2dcbd6..10d4a61 100644 --- a/ush-payload/src/main.rs +++ b/ush-payload/src/main.rs @@ -1,13 +1,13 @@ #![macro_use] extern crate unshell; -use unshell::{info, logger::PrettyLogger, obfuscate::sym}; +use unshell::{info, obfuscate::sym, tree::Tree}; fn main() { - PrettyLogger::init(); + // PrettyLogger::init(); - // let mut manager = Tree::new(); - // manager.init_logger(); + let mut manager = Tree::new(); + manager.init_logger(); println!("{}", sym!("TEST"));