Merge branch 'main' into estk/remove_derive_more

estk · estk · commit 7d9819738099 · 2025-11-15T22:28:41.000-08:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/estk/log4rs"
 readme = "README.md"
 keywords = ["log", "logger", "logging", "log4"]
-edition = "2018"
+edition = "2021"
 rust-version = "1.82"
 
 [features]
@@ -112,7 +112,7 @@ libc = { version = "0.2", optional = true }
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 thread-id = { version = "5", optional = true }
 
-[target.'cfg(all(target_family = "wasm", feature="time_trigger"))'.dependencies]
+[target.'cfg(all(target_family = "wasm"))'.dependencies]
 getrandom = { version = "0.3.3", features = ["wasm_js"], optional = true }
 
 
diff --git a/benches/rotation.rs b/benches/rotation.rs
@@ -100,6 +100,7 @@ fn mk_config(file_size: u64, file_count: u32) -> log4rs::config::Config {
         .unwrap()
 }
 
+#[allow(dead_code)]
 #[derive(Debug)]
 struct Stats {
     min: Duration,
@@ -140,8 +141,8 @@ impl Stats {
         let mut anomalies = vec![];
         let thresh = self.mean_nanos + ((self.stddev_nanos * 50.0).round() as u128);
         for dur in measurements {
-            if dur.as_nanos() as u128 > thresh {
-                anomalies.push(dur.clone());
+            if dur.as_nanos() > thresh {
+                anomalies.push(*dur);
             }
         }
         anomalies
diff --git a/examples/compile_time_config.rs b/examples/compile_time_config.rs
@@ -1,6 +1,4 @@
 use log::{error, info, trace};
-use log4rs;
-use serde_yaml;
 
 fn main() {
     let config_str = include_str!("sample_config.yml");
diff --git a/examples/custom.rs b/examples/custom.rs
@@ -36,7 +36,7 @@ impl MyFilter {
 }
 
 impl Filter for MyFilter {
-    fn filter(&self, record: &log::Record) -> Response {
+    fn filter(&self, record: &log::Record<'_>) -> Response {
         // Exclude all log messages at the info level
         if record.level() == self.level {
             return Response::Reject;
@@ -63,7 +63,7 @@ impl Encode for MyEncoder {
     fn encode(
         &self,
         w: &mut dyn log4rs::encode::Write,
-        record: &log::Record,
+        record: &log::Record<'_>,
     ) -> anyhow::Result<()> {
         // Write the prefix followed by the log message
         writeln!(
@@ -105,7 +105,7 @@ impl MyAppender {
 }
 
 impl Append for MyAppender {
-    fn append(&self, record: &log::Record) -> anyhow::Result<()> {
+    fn append(&self, record: &log::Record<'_>) -> anyhow::Result<()> {
         match record.level() {
             log::Level::Trace | log::Level::Debug => {
                 let mut writer = self.console_writer.lock();
diff --git a/examples/custom_config.rs b/examples/custom_config.rs
@@ -31,7 +31,7 @@ impl MyFilter {
 }
 
 impl Filter for MyFilter {
-    fn filter(&self, record: &log::Record) -> Response {
+    fn filter(&self, record: &log::Record<'_>) -> Response {
         // Exclude all log messages at the info level
         if record.level() == self.level {
             return Response::Reject;
@@ -58,7 +58,7 @@ impl Encode for MyEncoder {
     fn encode(
         &self,
         w: &mut dyn log4rs::encode::Write,
-        record: &log::Record,
+        record: &log::Record<'_>,
     ) -> anyhow::Result<()> {
         // Write the prefix followed by the log message
         writeln!(
@@ -100,7 +100,7 @@ impl MyAppender {
 }
 
 impl Append for MyAppender {
-    fn append(&self, record: &log::Record) -> anyhow::Result<()> {
+    fn append(&self, record: &log::Record<'_>) -> anyhow::Result<()> {
         match record.level() {
             log::Level::Trace | log::Level::Debug => {
                 let mut writer = self.console_writer.lock();
diff --git a/examples/multi_logger_config.rs b/examples/multi_logger_config.rs
@@ -1,7 +1,6 @@
 use std::{default::Default, thread, time::Duration};
 
 use log::{error, warn};
-use log4rs;
 
 fn main() {
     log4rs::init_file("examples/multi_logger.yml", Default::default()).unwrap();
diff --git a/src/append/console.rs b/src/append/console.rs
@@ -96,7 +96,7 @@ impl<'a> io::Write for WriterLock<'a> {
         }
     }
 
-    fn write_fmt(&mut self, fmt: fmt::Arguments) -> io::Result<()> {
+    fn write_fmt(&mut self, fmt: fmt::Arguments<'_>) -> io::Result<()> {
         match *self {
             WriterLock::Tty(ref mut w) => w.write_fmt(fmt),
             WriterLock::Raw(ref mut w) => w.write_fmt(fmt),
@@ -126,7 +126,7 @@ pub struct ConsoleAppender {
 }
 
 impl Append for ConsoleAppender {
-    fn append(&self, record: &Record) -> anyhow::Result<()> {
+    fn append(&self, record: &Record<'_>) -> anyhow::Result<()> {
         if self.do_write {
             let mut writer = self.writer.lock();
             self.encoder.encode(&mut writer, record)?;
diff --git a/src/append/file.rs b/src/append/file.rs
@@ -49,7 +49,7 @@ pub struct FileAppender {
 }
 
 impl Append for FileAppender {
-    fn append(&self, record: &Record) -> anyhow::Result<()> {
+    fn append(&self, record: &Record<'_>) -> anyhow::Result<()> {
         let mut file = self.file.lock();
         self.encoder.encode(&mut *file, record)?;
         file.flush()?;
@@ -327,7 +327,7 @@ mod test {
             .unwrap();
 
         // Only MAX_REPLACEMENTS should be replaced, the rest should remain as $TIME{...}
-        let mut expected_path = format!("foo/bar/logs/log");
+        let mut expected_path = "foo/bar/logs/log".to_string();
         for i in 0..10 {
             if i < MAX_REPLACEMENTS {
                 expected_path.push_str(&format!("-{}", current_time));
diff --git a/src/append/mod.rs b/src/append/mod.rs
@@ -45,7 +45,7 @@ mod env_util {
     where
         Str: Into<Cow<'str, str>>,
     {
-        let mut outpath: Cow<str> = path.into();
+        let mut outpath: Cow<'_, str> = path.into();
         let path = outpath.clone();
         for (match_start, _) in path.match_indices(ENV_PREFIX) {
             let env_name_start = match_start + ENV_PREFIX_LEN;
@@ -89,7 +89,7 @@ mod env_util {
 /// to a file or the console.
 pub trait Append: fmt::Debug + Send + Sync + 'static {
     /// Processes the provided `Record`.
-    fn append(&self, record: &Record) -> anyhow::Result<()>;
+    fn append(&self, record: &Record<'_>) -> anyhow::Result<()>;
 
     /// Flushes all in-flight records.
     fn flush(&self);
@@ -103,7 +103,7 @@ impl Deserializable for dyn Append {
 }
 
 impl<T: Log + fmt::Debug + 'static> Append for T {
-    fn append(&self, record: &Record) -> anyhow::Result<()> {
+    fn append(&self, record: &Record<'_>) -> anyhow::Result<()> {
         self.log(record);
         Ok(())
     }
@@ -159,7 +159,7 @@ mod test {
     #[test]
     #[cfg(any(feature = "file_appender", feature = "rolling_file_appender"))]
     fn expand_env_vars_tests() {
-        set_var("HELLO_WORLD", "GOOD BYE");
+        unsafe { set_var("HELLO_WORLD", "GOOD BYE") };
         #[cfg(not(target_os = "windows"))]
         let test_cases = vec![
             ("$ENV{HOME}", var("HOME").unwrap()),
diff --git a/src/append/rolling_file/mod.rs b/src/append/rolling_file/mod.rs
@@ -161,7 +161,7 @@ pub struct RollingFileAppender {
 }
 
 impl Append for RollingFileAppender {
-    fn append(&self, record: &Record) -> anyhow::Result<()> {
+    fn append(&self, record: &Record<'_>) -> anyhow::Result<()> {
         // TODO(eas): Perhaps this is better as a concurrent queue?
         let mut writer = self.writer.lock();
 
@@ -420,7 +420,7 @@ appenders:
     struct NopPolicy;
 
     impl Policy for NopPolicy {
-        fn process(&self, _: &mut LogFile) -> anyhow::Result<()> {
+        fn process(&self, _: &mut LogFile<'_>) -> anyhow::Result<()> {
             Ok(())
         }
         fn is_pre_process(&self) -> bool {
diff --git a/src/append/rolling_file/policy/compound/mod.rs b/src/append/rolling_file/policy/compound/mod.rs
@@ -100,7 +100,7 @@ impl CompoundPolicy {
 }
 
 impl Policy for CompoundPolicy {
-    fn process(&self, log: &mut LogFile) -> anyhow::Result<()> {
+    fn process(&self, log: &mut LogFile<'_>) -> anyhow::Result<()> {
         if self.trigger.trigger(log)? {
             log.roll();
             self.roller.roll(log.path())?;
diff --git a/src/append/rolling_file/policy/compound/roll/fixed_window.rs b/src/append/rolling_file/policy/compound/roll/fixed_window.rs
@@ -471,7 +471,7 @@ mod test {
         wait_for_roller(&roller);
         assert!(!file.exists());
         contents.clear();
-        File::open(dir.path().join(&format!("{}.{}", fname, base + 1)))
+        File::open(dir.path().join(format!("{}.{}", fname, base + 1)))
             .unwrap()
             .read_to_end(&mut contents)
             .unwrap();
@@ -620,7 +620,7 @@ mod test {
 
     #[test]
     fn roll_with_env_var() {
-        std::env::set_var("LOG_DIR", "test_log_dir");
+        unsafe { std::env::set_var("LOG_DIR", "test_log_dir") };
         let fcontent = b"file1";
         let dir = tempfile::tempdir().unwrap();
 
diff --git a/src/append/rolling_file/policy/compound/trigger/mod.rs b/src/append/rolling_file/policy/compound/trigger/mod.rs
@@ -18,7 +18,7 @@ pub mod onstartup;
 /// A trait which identifies if the active log file should be rolled over.
 pub trait Trigger: fmt::Debug + Send + Sync + 'static {
     /// Determines if the active log file should be rolled over.
-    fn trigger(&self, file: &LogFile) -> anyhow::Result<bool>;
+    fn trigger(&self, file: &LogFile<'_>) -> anyhow::Result<bool>;
 
     /// Sets the is_pre_process flag for log files.
     ///
diff --git a/src/append/rolling_file/policy/compound/trigger/onstartup.rs b/src/append/rolling_file/policy/compound/trigger/onstartup.rs
@@ -41,7 +41,7 @@ impl OnStartUpTrigger {
 }
 
 impl Trigger for OnStartUpTrigger {
-    fn trigger(&self, file: &LogFile) -> anyhow::Result<bool> {
+    fn trigger(&self, file: &LogFile<'_>) -> anyhow::Result<bool> {
         let mut result = false;
         self.initial.call_once(|| {
             if file.len_estimate() >= self.min_size {
diff --git a/src/append/rolling_file/policy/compound/trigger/size.rs b/src/append/rolling_file/policy/compound/trigger/size.rs
@@ -31,7 +31,7 @@ where
     impl<'de2> de::Visitor<'de2> for V {
         type Value = u64;
 
-        fn expecting(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        fn expecting(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
             fmt.write_str("a size")
         }
 
@@ -114,7 +114,7 @@ impl SizeTrigger {
 }
 
 impl Trigger for SizeTrigger {
-    fn trigger(&self, file: &LogFile) -> anyhow::Result<bool> {
+    fn trigger(&self, file: &LogFile<'_>) -> anyhow::Result<bool> {
         Ok(file.len_estimate() > self.limit)
     }
 
diff --git a/src/append/rolling_file/policy/compound/trigger/time.rs b/src/append/rolling_file/policy/compound/trigger/time.rs
@@ -107,7 +107,7 @@ impl<'de> serde::Deserialize<'de> for TimeTriggerInterval {
         impl<'de2> de::Visitor<'de2> for V {
             type Value = TimeTriggerInterval;
 
-            fn expecting(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+            fn expecting(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
                 fmt.write_str("a time")
             }
 
@@ -293,7 +293,7 @@ impl TimeTrigger {
 }
 
 impl Trigger for TimeTrigger {
-    fn trigger(&self, _file: &LogFile) -> anyhow::Result<bool> {
+    fn trigger(&self, _file: &LogFile<'_>) -> anyhow::Result<bool> {
         self.initial.call_once(|| {
             self.refresh_time();
         });
@@ -444,7 +444,7 @@ mod test {
     #[test]
     #[cfg(feature = "yaml_format")]
     fn test_serde() {
-        let test_error = vec![
+        let test_error = [
             "abc",   // // str none none
             "",      // none
             "5 das", // bad unit
@@ -453,7 +453,7 @@ mod test {
         ];
 
         for interval in test_error.iter() {
-            let error = ::serde_yaml::from_str::<TimeTriggerInterval>(&interval);
+            let error = ::serde_yaml::from_str::<TimeTriggerInterval>(interval);
             assert!(error.is_err());
         }
 
@@ -483,7 +483,7 @@ mod test {
             ("1 years", TimeTriggerInterval::Year(1)),
         ];
         for (interval, expected) in test_ok.iter() {
-            let interval = format!("{}", interval);
+            let interval = interval.to_string();
             let interval = ::serde_yaml::from_str::<TimeTriggerInterval>(&interval).unwrap();
             assert_eq!(interval, *expected);
         }
diff --git a/src/append/rolling_file/policy/mod.rs b/src/append/rolling_file/policy/mod.rs
@@ -15,7 +15,7 @@ pub trait Policy: Sync + Send + 'static + fmt::Debug {
     ///
     /// This method is called after each log event. It is provided a reference
     /// to the current log file.
-    fn process(&self, log: &mut LogFile) -> anyhow::Result<()>;
+    fn process(&self, log: &mut LogFile<'_>) -> anyhow::Result<()>;
     /// Return the config `Trigger.is_pre_process` value
     fn is_pre_process(&self) -> bool;
 }
diff --git a/src/config/raw.rs b/src/config/raw.rs
@@ -419,7 +419,7 @@ where
             impl<'de3> de::Visitor<'de3> for V {
                 type Value = S;
 
-                fn expecting(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+                fn expecting(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
                     fmt.write_str("a duration")
                 }
 
@@ -529,7 +529,7 @@ loggers:
     const LINE_ENDING: &'static str = "\r\n";
     #[cfg(not(windows))]
     #[allow(dead_code)]
-    const LINE_ENDING: &'static str = "\n";
+    const LINE_ENDING: &str = "\n";
 
     #[test]
     #[cfg(feature = "yaml_format")]
diff --git a/src/encode/json.rs b/src/encode/json.rs
@@ -67,7 +67,7 @@ impl JsonEncoder {
         &self,
         w: &mut dyn Write,
         time: DateTime<Local>,
-        record: &Record,
+        record: &Record<'_>,
     ) -> anyhow::Result<()> {
         let thread = thread::current();
         let message = Message {
@@ -92,7 +92,7 @@ impl JsonEncoder {
 }
 
 impl Encode for JsonEncoder {
-    fn encode(&self, w: &mut dyn Write, record: &Record) -> anyhow::Result<()> {
+    fn encode(&self, w: &mut dyn Write, record: &Record<'_>) -> anyhow::Result<()> {
         self.encode_inner(w, Local::now(), record)
     }
 }
diff --git a/src/encode/mod.rs b/src/encode/mod.rs
@@ -35,7 +35,7 @@ const NEWLINE: &str = "\n";
 /// output.
 pub trait Encode: fmt::Debug + Send + Sync + 'static {
     /// Encodes the `Record` into bytes and writes them.
-    fn encode(&self, w: &mut dyn Write, record: &Record) -> anyhow::Result<()>;
+    fn encode(&self, w: &mut dyn Write, record: &Record<'_>) -> anyhow::Result<()>;
 }
 
 #[cfg(feature = "config_parsing")]
@@ -147,7 +147,7 @@ pub trait Write: io::Write {
     }
 }
 
-impl<'a, W: Write + ?Sized> Write for &'a mut W {
+impl<W: Write + ?Sized> Write for &mut W {
     fn set_style(&mut self, style: &Style) -> io::Result<()> {
         <W as Write>::set_style(*self, style)
     }
diff --git a/src/encode/pattern/mod.rs b/src/encode/pattern/mod.rs
diff --git a/src/encode/writer/ansi.rs b/src/encode/writer/ansi.rs
diff --git a/src/encode/writer/console.rs b/src/encode/writer/console.rs
diff --git a/src/encode/writer/simple.rs b/src/encode/writer/simple.rs
diff --git a/src/filter/mod.rs b/src/filter/mod.rs
diff --git a/src/filter/threshold.rs b/src/filter/threshold.rs
diff --git a/src/lib.rs b/src/lib.rs
diff --git a/src/priv_io.rs b/src/priv_io.rs
diff --git a/tests/color_control.rs b/tests/color_control.rs

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ fn mk_config(file_size: u64, file_count: u32) -> log4rs::config::Config {`
`100`	`100`	`.unwrap()`
`101`	`101`	`}`
`102`	`102`
	`103`	`+#[allow(dead_code)]`
`103`	`104`	`#[derive(Debug)]`
`104`	`105`	`struct Stats {`
`105`	`106`	`min: Duration,`
`@@ -140,8 +141,8 @@ impl Stats {`
`140`	`141`	`let mut anomalies = vec![];`
`141`	`142`	`let thresh = self.mean_nanos + ((self.stddev_nanos * 50.0).round() as u128);`
`142`	`143`	`for dur in measurements {`
`143`		`- if dur.as_nanos() as u128 > thresh {`
`144`		`- anomalies.push(dur.clone());`
	`144`	`+ if dur.as_nanos() > thresh {`
	`145`	`+ anomalies.push(*dur);`
`145`	`146`	`}`
`146`	`147`	`}`
`147`	`148`	`anomalies`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ impl<'a> io::Write for WriterLock<'a> {`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
`99`		`- fn write_fmt(&mut self, fmt: fmt::Arguments) -> io::Result<()> {`
	`99`	`+ fn write_fmt(&mut self, fmt: fmt::Arguments<'_>) -> io::Result<()> {`
`100`	`100`	`match *self {`
`101`	`101`	`WriterLock::Tty(ref mut w) => w.write_fmt(fmt),`
`102`	`102`	`WriterLock::Raw(ref mut w) => w.write_fmt(fmt),`
`@@ -126,7 +126,7 @@ pub struct ConsoleAppender {`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`impl Append for ConsoleAppender {`
`129`		`- fn append(&self, record: &Record) -> anyhow::Result<()> {`
	`129`	`+ fn append(&self, record: &Record<'_>) -> anyhow::Result<()> {`
`130`	`130`	`if self.do_write {`
`131`	`131`	`let mut writer = self.writer.lock();`
`132`	`132`	`self.encoder.encode(&mut writer, record)?;`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ pub struct RollingFileAppender {`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`impl Append for RollingFileAppender {`
`164`		`- fn append(&self, record: &Record) -> anyhow::Result<()> {`
	`164`	`+ fn append(&self, record: &Record<'_>) -> anyhow::Result<()> {`
`165`	`165`	`// TODO(eas): Perhaps this is better as a concurrent queue?`
`166`	`166`	`let mut writer = self.writer.lock();`
`167`	`167`
`@@ -420,7 +420,7 @@ appenders:`
`420`	`420`	`struct NopPolicy;`
`421`	`421`
`422`	`422`	`impl Policy for NopPolicy {`
`423`		`- fn process(&self, _: &mut LogFile) -> anyhow::Result<()> {`
	`423`	`+ fn process(&self, _: &mut LogFile<'_>) -> anyhow::Result<()> {`
`424`	`424`	`Ok(())`
`425`	`425`	`}`
`426`	`426`	`fn is_pre_process(&self) -> bool {`