Add support for downcasting instrumentation

diesel-rs · Jul 25, 2024 · 034826a · 034826a
1 parent 5444b38
commit 034826a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/diesel/Cargo.toml b/diesel/Cargo.toml
@@ -44,6  44,7 @@ bitflags = { version = "2.0.0", optional = true }
 r2d2 = { version = ">= 0.8.2, < 0.9.0", optional = true }
 itoa = { version = "1.0.0", optional = true }
 time = { version = "0.3.9", optional = true, features = ["macros"] }
 downcast-rs = "1.2.1"
 
 [dependencies.diesel_derives]
 version = "~2.2.0"

diff --git a/diesel/src/connection/instrumentation.rs b/diesel/src/connection/instrumentation.rs
@@ -1,5  1,5 @@
-use std::fmt::Debug;
-use std::fmt::Display;
 use downcast_rs::Downcast;
 use std::fmt::{Debug, Display};
 use std::num::NonZeroU32;
 use std::ops::DerefMut;
 
@@ -242,10  242,11 @@ impl<'a> InstrumentationEvent<'a> {
 /// More complex usages and integrations with frameworks like
 /// `tracing` and `log` are supposed to be part of their own
 /// crates.
-pub trait Instrumentation: Send   'static {
 pub trait Instrumentation: Downcast   Send   'static {
     /// The function that is invoced for each event
     fn on_connection_event(&mut self, event: InstrumentationEvent<'_>);
 }
 downcast_rs::impl_downcast!(Instrumentation);
 
 /// Get an instance of the default [`Instrumentation`]
 ///
@@ -266,9  267,11 @@ pub fn get_default_instrumentation() -> Option<Box<dyn Instrumentation>> {
 ///
 /// // a simple logger that prints all events to stdout
 /// fn simple_logger() -> Option<Box<dyn Instrumentation>> {
-///    // we need the explicit argument type there due
-///    // to bugs in rustc
-///    Some(Box::new(|event: InstrumentationEvent<'_>| println!("{event:?}")))
 ///     // we need the explicit argument type there due
 ///     // to bugs in rustc
 ///     Some(Box::new(|event: InstrumentationEvent<'_>| {
 ///         println!("{event:?}")
 ///     }))
 /// }
 ///
 /// set_default_instrumentation(simple_logger);