Receive formatter parameter as generic if dyn-compatible is not required

Author: SpriteOvO

spdlog/src/sink/async_sink/async_pool_sink.rs

@@ -72,7 +72,7 @@ impl AsyncPoolSink {
         // AsyncPoolSink does not have its own formatter, and we do not impl
         // `GetSinkProp` for it, so there should be no way to access the
         // formatter inside the `prop`.
-        prop.set_formatter(Box::new(UnreachableFormatter::new()));
+        prop.set_formatter(UnreachableFormatter::new());
 
         AsyncPoolSinkBuilder {
             prop,
@@ -210,7 +210,10 @@ impl AsyncPoolSinkBuilder {
     ///
     /// This parameter is **optional**.
     #[must_use]
-    pub fn formatter(self, formatter: Box<dyn Formatter>) -> Self {
+    pub fn formatter<F>(self, formatter: F) -> Self
+    where
+        F: Formatter + 'static,
+    {
         self.prop.set_formatter(formatter);
         self
     }

spdlog/src/sink/dedup_sink.rs

@@ -254,7 +254,10 @@ impl<ArgS> DedupSinkBuilder<ArgS> {
     ///
     /// This parameter is **optional**.
     #[must_use]
-    pub fn formatter(self, formatter: Box<dyn Formatter>) -> Self {
+    pub fn formatter<F>(self, formatter: F) -> Self
+    where
+        F: Formatter + 'static,
+    {
         self.prop.set_formatter(formatter);
         self
     }

spdlog/src/sink/file_sink.rs

@@ -187,7 +187,10 @@ impl<ArgPath> FileSinkBuilder<ArgPath> {
     ///
     /// This parameter is **optional**.
     #[must_use]
-    pub fn formatter(self, formatter: Box<dyn Formatter>) -> Self {
+    pub fn formatter<F>(self, formatter: F) -> Self
+    where
+        F: Formatter + 'static,
+    {
         self.prop.set_formatter(formatter);
         self
     }

spdlog/src/sink/journald_sink.rs

@@ -109,7 +109,7 @@ impl JournaldSink {
     #[must_use]
     pub fn builder() -> JournaldSinkBuilder {
         let prop = SinkProp::default();
-        prop.set_formatter(Box::new(JournaldFormatter::new()));
+        prop.set_formatter(JournaldFormatter::new());
 
         JournaldSinkBuilder { prop }
     }
@@ -175,7 +175,10 @@ impl JournaldSinkBuilder {
     ///
     /// This parameter is **optional**.
     #[must_use]
-    pub fn formatter(self, formatter: Box<dyn Formatter>) -> Self {
+    pub fn formatter<F>(self, formatter: F) -> Self
+    where
+        F: Formatter + 'static,
+    {
         self.prop.set_formatter(formatter);
         self
     }

spdlog/src/sink/mod.rs

@@ -103,7 +103,14 @@ impl SinkProp {
     }
 
     /// Sets the formatter.
-    pub fn set_formatter(&self, formatter: Box<dyn Formatter>) {
+    pub fn set_formatter<F>(&self, formatter: F)
+    where
+        F: Formatter + 'static,
+    {
+        self.set_formatter_boxed(Box::new(formatter));
+    }
+
+    pub fn set_formatter_boxed(&self, formatter: Box<dyn Formatter>) {
         *self.formatter.write() = formatter;
     }
 
@@ -173,7 +180,7 @@ impl<S: GetSinkProp> SinkAccess for S {
     }
 
     fn set_formatter(&self, formatter: Box<dyn Formatter>) {
-        self.prop().set_formatter(formatter);
+        self.prop().set_formatter_boxed(formatter);
     }
 
     fn set_error_handler(&self, handler: Option<ErrorHandler>) {

spdlog/src/sink/rotating_file_sink.rs

@@ -815,7 +815,10 @@ impl<ArgBP, ArgRP> RotatingFileSinkBuilder<ArgBP, ArgRP> {
     ///
     /// This parameter is **optional**.
     #[must_use]
-    pub fn formatter(self, formatter: Box<dyn Formatter>) -> Self {
+    pub fn formatter<F>(self, formatter: F) -> Self
+    where
+        F: Formatter + 'static,
+    {
         self.prop.set_formatter(formatter);
         self
     }

spdlog/src/sink/std_stream_sink.rs

@@ -273,7 +273,10 @@ impl<ArgSS> StdStreamSinkBuilder<ArgSS> {
     ///
     /// This parameter is **optional**.
     #[must_use]
-    pub fn formatter(self, formatter: Box<dyn Formatter>) -> Self {
+    pub fn formatter<F>(self, formatter: F) -> Self
+    where
+        F: Formatter + 'static,
+    {
         self.prop.set_formatter(formatter);
         self
     }

spdlog/src/sink/win_debug_sink.rs

@@ -95,7 +95,10 @@ impl WinDebugSinkBuilder {
     ///
     /// This parameter is **optional**.
     #[must_use]
-    pub fn formatter(self, formatter: Box<dyn Formatter>) -> Self {
+    pub fn formatter<F>(self, formatter: F) -> Self
+    where
+        F: Formatter + 'static,
+    {
         self.prop.set_formatter(formatter);
         self
     }

spdlog/src/sink/write_sink.rs

@@ -180,7 +180,10 @@ where
     ///
     /// This parameter is **optional**.
     #[must_use]
-    pub fn formatter(self, formatter: Box<dyn Formatter>) -> Self {
+    pub fn formatter<F>(self, formatter: F) -> Self
+    where
+        F: Formatter + 'static,
+    {
         self.prop.set_formatter(formatter);
         self
     }