Remove usage of derivative crate, replace by derive_more

Author: royb3

Cargo.toml

@@ -91,7 +91,7 @@ parking_lot = { version = "0.12.0", optional = true }
 rand = { version = "0.9", optional = true }
 thiserror = "2.0.12"
 anyhow = "1.0.28"
-derivative = "2.2"
+derive_more = { version = "2.0.1", features = ["debug"] }
 once_cell = "1.17.1"
 mock_instant = "0.5"
 

src/append/console.rs

@@ -2,7 +2,7 @@
 //!
 //! Requires the `console_appender` feature.
 
-use derivative::Derivative;
+use derive_more::Debug;
 use log::Record;
 use std::{
     fmt,
@@ -117,10 +117,9 @@ impl<'a> encode::Write for WriterLock<'a> {
 ///
 /// It supports output styling if standard out is a console buffer on Windows
 /// or is a TTY on Unix.
-#[derive(Derivative)]
-#[derivative(Debug)]
+#[derive(Debug)]
 pub struct ConsoleAppender {
-    #[derivative(Debug = "ignore")]
+    #[debug(skip)]
     writer: Writer,
     encoder: Box<dyn Encode>,
     do_write: bool,

src/append/file.rs

@@ -2,7 +2,7 @@
 //!
 //! Requires the `file_appender` feature.
 
-use derivative::Derivative;
+use derive_more::Debug;
 use log::Record;
 use parking_lot::Mutex;
 use std::{
@@ -32,11 +32,10 @@ pub struct FileAppenderConfig {
 }
 
 /// An appender which logs to a file.
-#[derive(Derivative)]
-#[derivative(Debug)]
+#[derive(Debug)]
 pub struct FileAppender {
     path: PathBuf,
-    #[derivative(Debug = "ignore")]
+    #[debug(skip)]
     file: Mutex<SimpleWriter<BufWriter<File>>>,
     encoder: Box<dyn Encode>,
 }

src/append/rolling_file/mod.rs

@@ -16,7 +16,7 @@
 //!
 //! Requires the `rolling_file_appender` feature.
 
-use derivative::Derivative;
+use derive_more::Debug;
 use log::Record;
 use parking_lot::Mutex;
 use std::{
@@ -151,10 +151,9 @@ impl<'a> LogFile<'a> {
 }
 
 /// An appender which archives log files in a configurable strategy.
-#[derive(Derivative)]
-#[derivative(Debug)]
+#[derive(Debug)]
 pub struct RollingFileAppender {
-    #[derivative(Debug = "ignore")]
+    #[debug(skip)]
     writer: Mutex<Option<LogWriter>>,
     path: PathBuf,
     append: bool,
@@ -367,6 +366,7 @@ impl Deserialize for RollingFileAppenderDeserializer {
 
 #[cfg(test)]
 mod test {
+    use derive_more::Debug;
     use std::{
         fs::File,
         io::{Read, Write},

src/config/raw.rs

@@ -92,7 +92,7 @@
 use std::{collections::HashMap, fmt, marker::PhantomData, sync::Arc, time::Duration};
 
 use anyhow::anyhow;
-use derivative::Derivative;
+use derive_more::Debug;
 use log::LevelFilter;
 use serde::de::{self, Deserialize as SerdeDeserialize, DeserializeOwned};
 use serde_value::Value;
@@ -438,17 +438,25 @@ where
     Option::<S>::deserialize(d).map(|r| r.map(|s| s.0))
 }
 
-#[derive(Clone, Debug, Derivative, serde::Deserialize)]
-#[derivative(Default)]
+#[derive(Clone, Debug, serde::Deserialize)]
 #[serde(deny_unknown_fields)]
 struct Root {
     #[serde(default = "root_level_default")]
-    #[derivative(Default(value = "root_level_default()"))]
     level: LevelFilter,
     #[serde(default)]
     appenders: Vec<String>,
 }
 
+/// Implementing default on Root, which was previously done using "derivative" derive, which is not yet supported by derive_more.
+impl Default for Root {
+    fn default() -> Self {
+        Self {
+            level: root_level_default(),
+            appenders: Default::default(),
+        }
+    }
+}
+
 fn root_level_default() -> LevelFilter {
     LevelFilter::Debug
 }

src/encode/mod.rs

@@ -1,6 +1,6 @@
 //! Encoders
 
-use derivative::Derivative;
+use derive_more::Debug;
 use log::Record;
 use std::{fmt, io};
 
@@ -94,17 +94,15 @@ pub enum Color {
 ///
 /// Any fields set to `None` will be set to their default format, as defined
 /// by the `Write`r.
-#[derive(Derivative)]
-#[derivative(Debug)]
-#[derive(Clone, Eq, PartialEq, Hash, Default)]
+#[derive(Clone, Eq, PartialEq, Hash, Debug, Default)]
 pub struct Style {
     /// The text (or foreground) color.
     pub text: Option<Color>,
     /// The background color.
     pub background: Option<Color>,
     /// True if the text should have increased intensity.
     pub intense: Option<bool>,
-    #[derivative(Debug = "ignore")]
+    #[debug(skip)]
     _p: (),
 }
 

src/encode/pattern/mod.rs

@@ -122,7 +122,7 @@
 //! [MDC]: https://crates.io/crates/log-mdc
 
 use chrono::{Local, Utc};
-use derivative::Derivative;
+use derive_more::Debug;
 use log::{Level, Record};
 use std::{default::Default, io, process, thread};
 
@@ -671,11 +671,9 @@ impl FormattedChunk {
 }
 
 /// An `Encode`r configured via a format string.
-#[derive(Derivative)]
-#[derivative(Debug)]
-#[derive(Clone, Eq, PartialEq, Hash)]
+#[derive(Clone, Eq, Debug, PartialEq, Hash)]
 pub struct PatternEncoder {
-    #[derivative(Debug = "ignore")]
+    #[debug(skip)]
     chunks: Vec<Chunk>,
     pattern: String,
 }