From 9ebd91a5894a40ee566ca08efcd20bde6aff268f Mon Sep 17 00:00:00 2001 From: jutty Date: Mon, 16 Mar 2026 20:02:03 -0300 Subject: [PATCH] Move log module to dev::log --- src/dev.rs | 2 ++ src/{ => dev}/log.rs | 12 ++++++------ src/{ => dev}/log/level.rs | 0 src/lib.rs | 7 +++---- src/main.rs | 2 +- src/router/handlers/template.rs | 8 ++++++++ src/syntax/content/parser/lexeme.rs | 2 +- src/syntax/content/parser/token/anchor.rs | 2 +- src/syntax/content/parser/token/literal.rs | 2 +- 9 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 src/dev.rs rename src/{ => dev}/log.rs (95%) rename src/{ => dev}/log/level.rs (100%) diff --git a/src/dev.rs b/src/dev.rs new file mode 100644 index 0000000..c4eb55e --- /dev/null +++ b/src/dev.rs @@ -0,0 +1,2 @@ +pub mod log; +pub mod test; diff --git a/src/log.rs b/src/dev/log.rs similarity index 95% rename from src/log.rs rename to src/dev/log.rs index ebc6eb7..7302c8c 100644 --- a/src/log.rs +++ b/src/dev/log.rs @@ -114,7 +114,7 @@ pub fn timed(past: &Instant, message: &str) -> Instant { #[macro_export] macro_rules! tlog { ($instant:expr, $fmt:expr $(, $($arg:tt)+ )?) => {{ - $crate::log::timed($instant, &format!($fmt $(, $($arg)+ )?)) + $crate::dev::log::timed($instant, &format!($fmt $(, $($arg)+ )?)) }}; } @@ -129,26 +129,26 @@ pub fn elog(function: &str, message: &str) { macro_rules! log { ($level:path, $fmt:expr $(, $($arg:tt)+ )?) => {{ - let data = $crate::log::Data::new( + let data = $crate::dev::log::Data::new( Some($level), std::any::type_name_of_val(&|| {}), std::backtrace::Backtrace::capture(), ); if data.should_log { - $crate::log::elog(&data.path, &format!($fmt $(, $($arg)+ )?)); + $crate::dev::log::elog(&data.path, &format!($fmt $(, $($arg)+ )?)); } }}; ($fmt:expr $(, $($arg:tt)+ )?) => {{ - let data = $crate::log::Data::new( + let data = $crate::dev::log::Data::new( None, std::any::type_name_of_val(&|| {}), std::backtrace::Backtrace::capture(), ); if data.should_log { - $crate::log::elog(&data.path, &format!($fmt $(, $($arg)+ )?)); + $crate::dev::log::elog(&data.path, &format!($fmt $(, $($arg)+ )?)); }; }}; @@ -272,7 +272,7 @@ mod tests { fn test(&self); } - struct Logger {} + struct Logger; impl Loggable for Logger { fn test(&self) { diff --git a/src/log/level.rs b/src/dev/log/level.rs similarity index 100% rename from src/log/level.rs rename to src/dev/log/level.rs diff --git a/src/lib.rs b/src/lib.rs index 473bb4f..6d9c62a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,14 +2,13 @@ use std::{sync, time}; pub mod prelude { pub use crate::{ - log, - log::{Level::*, now}, - tlog, write_log, + dev::log::{Level::*, now}, + log, tlog, write_log, }; } +pub mod dev; pub mod graph; -pub mod log; pub mod router; pub mod syntax; diff --git a/src/main.rs b/src/main.rs index 23fe357..9382190 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,6 @@ use std::{backtrace, io, panic}; -use en::{ONSET, graph::Graph, log, prelude::*, syntax}; +use en::{ONSET, dev::log, graph::Graph, prelude::*, syntax}; #[tokio::main] #[expect(clippy::print_stderr, clippy::print_stdout, clippy::use_debug)] diff --git a/src/router/handlers/template.rs b/src/router/handlers/template.rs index 01bb7ea..8a375ee 100644 --- a/src/router/handlers/template.rs +++ b/src/router/handlers/template.rs @@ -6,6 +6,7 @@ use axum::{ }; use crate::{ + dev::log, prelude::*, router::{GlobalState, handlers::raw::make_response}, }; @@ -136,6 +137,13 @@ fn load_templates() -> Result { let root = PathBuf::from("templates"); let default_names: Vec<&str> = DEFAULTS.iter().map(|(n, _)| *n).collect(); + log!( + DEBUG, + "Reading templates from {}, canonical form {:?}", + root.display(), + root.canonicalize() + ); + match fs::read_dir(&root) { Ok(dir) => { for file_opt in dir { diff --git a/src/syntax/content/parser/lexeme.rs b/src/syntax/content/parser/lexeme.rs index 378a8b8..d0c1e3e 100644 --- a/src/syntax/content/parser/lexeme.rs +++ b/src/syntax/content/parser/lexeme.rs @@ -224,7 +224,7 @@ impl Lexeme { impl fmt::Display for Lexeme { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - use crate::log::wrap; + use crate::dev::log::wrap; let properties = if self.last && self.first { "[S] " diff --git a/src/syntax/content/parser/token/anchor.rs b/src/syntax/content/parser/token/anchor.rs index 3702d77..12ee711 100644 --- a/src/syntax/content/parser/token/anchor.rs +++ b/src/syntax/content/parser/token/anchor.rs @@ -121,7 +121,7 @@ impl Parseable for Anchor { impl std::fmt::Display for Anchor { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { - use crate::log::wrap; + use crate::dev::log::wrap; let wrapped_text = wrap(&self.text); let display_text = if wrapped_text.is_empty() { diff --git a/src/syntax/content/parser/token/literal.rs b/src/syntax/content/parser/token/literal.rs index 6991fb0..d812a64 100644 --- a/src/syntax/content/parser/token/literal.rs +++ b/src/syntax/content/parser/token/literal.rs @@ -23,7 +23,7 @@ impl Parseable for Literal { impl std::fmt::Display for Literal { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { - write!(f, "Literal {}", crate::log::wrap(&self.text)) + write!(f, "Literal {}", crate::dev::log::wrap(&self.text)) } }