From d50763aaee96f197e40f63ff910b6f416857d60a Mon Sep 17 00:00:00 2001 From: rascul Date: Sat, 24 Aug 2019 00:20:53 -0500 Subject: [PATCH] rustfmt --- rustfmt.toml | 3 +++ src/lib.rs | 42 +++++++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 rustfmt.toml diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 0000000..ae0311c --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,3 @@ +hard_tabs = true +newline_style = "unix" +use_try_shorthand = true diff --git a/src/lib.rs b/src/lib.rs index 5dc69a3..a3ebbbb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,19 +1,18 @@ /// Logger implementation for colors in the terminal and in the future /// logging to a file and to a remote log server - extern crate chrono; extern crate colored; extern crate log; use colored::*; -use log::{Log, LogLevel, LogLevelFilter, LogMetadata, LogRecord, set_logger}; +use log::{set_logger, Log, LogLevel, LogLevelFilter, LogMetadata, LogRecord}; +pub mod error; #[cfg(test)] mod tests; -pub mod error; -pub use error::RagResult; pub use error::RagError; +pub use error::RagResult; struct Logger; @@ -28,21 +27,26 @@ impl Log for Logger { let ts = now.format("%Y-%m-%dT%H:%M:%S%.3f%z").to_string(); let (msg, _level) = match record.level() { - LogLevel::Error => { - (format!("{} {} {}", ts.white().bold(), "ERR".red(), record.args()), 3) - } - LogLevel::Warn => { - (format!("{} {} {}", ts.white().bold(), "WRN".purple(), record.args()), 4) - } - LogLevel::Info => { - (format!("{} {} {}", ts.white().bold(), "INF".cyan(), record.args()), 6) - } - LogLevel::Debug => { - (format!("{} {} {}", ts.white().bold(), "DBG".yellow(), record.args()), 7) - } - LogLevel::Trace => { - (format!("{} {} {}", ts.white().bold(), "TRC".green(), record.args()), 0) - } + LogLevel::Error => ( + format!("{} {} {}", ts.white().bold(), "ERR".red(), record.args()), + 3, + ), + LogLevel::Warn => ( + format!("{} {} {}", ts.white().bold(), "WRN".purple(), record.args()), + 4, + ), + LogLevel::Info => ( + format!("{} {} {}", ts.white().bold(), "INF".cyan(), record.args()), + 6, + ), + LogLevel::Debug => ( + format!("{} {} {}", ts.white().bold(), "DBG".yellow(), record.args()), + 7, + ), + LogLevel::Trace => ( + format!("{} {} {}", ts.white().bold(), "TRC".green(), record.args()), + 0, + ), }; println!("{}", msg); }