Remove trace feature for optional dependency

eggyal · eggyal · commit 5da8f65cd7ce · 2021-10-14T13:33:58.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,6 @@ categories = ["data-structures", "memory-management", "no-std", "rust-patterns"]
 alloc = []
 std = ["alloc", "thiserror"]
 global = ["std"]
-trace = ["tracing"]
 
 [dependencies]
 thiserror = { version = "1.0.29", optional = true }
diff --git a/src/container/macros.rs b/src/container/macros.rs
@@ -11,12 +11,12 @@ macro_rules! coercible_trait {
         }
 
         unsafe impl $crate::container::InnermostTypeId for dyn $trait {
-            #[cfg_attr(feature = "trace", $crate::tracing::instrument(skip_all))]
+            #[cfg_attr(feature = "tracing", $crate::tracing::instrument(skip_all))]
             fn innermost_type_id(
                 &self,
             ) -> Result<::core::any::TypeId, $crate::container::TypeIdDeterminationError> {
                 let type_id = ::core::any::Any::type_id(self);
-                #[cfg(feature = "trace")]
+                #[cfg(feature = "tracing")]
                 $crate::tracing::info!("found type_id {:?}", type_id);
                 Ok(type_id)
             }
@@ -57,7 +57,7 @@ macro_rules! coercibles {
         where
             $t: ?::core::marker::Sized + $crate::container::InnermostTypeId,
         {
-            #[cfg_attr(feature = "trace", tracing::instrument(skip_all, fields(
+            #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, fields(
                 Self = ::core::any::type_name::<Self>(),
             )))]
             fn innermost_type_id(&$self) -> Result<::core::any::TypeId, $crate::container::TypeIdDeterminationError> $type
@@ -86,7 +86,7 @@ macro_rules! coercibles {
         where
             $t: ?::core::marker::Sized + $crate::container::Coercible,
         {
-            #[cfg_attr(feature = "trace", tracing::instrument(skip_all, fields(
+            #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, fields(
                 Self = ::core::any::type_name::<Self>(),
                 U = ::core::any::type_name::<U>(),
             )))]
diff --git a/src/db/hash_map.rs b/src/db/hash_map.rs
@@ -76,17 +76,17 @@ unsafe impl<U> TypeDatabaseEntry<U> for HashMapTypeDatabaseEntry<U>
 where
     U: ?Sized,
 {
-    #[cfg_attr(feature = "trace", tracing::instrument(skip(self, metadata)))]
+    #[cfg_attr(feature = "tracing", tracing::instrument(skip(self, metadata)))]
     unsafe fn add(&mut self, type_id: TypeId, metadata: Metadata<U>) {
         let _ = self.0.insert(type_id, metadata);
     }
 
-    #[cfg_attr(feature = "trace", tracing::instrument(skip(self)))]
+    #[cfg_attr(feature = "tracing", tracing::instrument(skip(self)))]
     fn contains(&self, type_id: TypeId) -> bool {
         self.0.contains_key(&type_id)
     }
 
-    #[cfg_attr(feature = "trace", tracing::instrument(skip(self)))]
+    #[cfg_attr(feature = "tracing", tracing::instrument(skip(self)))]
     fn metadata(&self, type_id: TypeId) -> Option<&Metadata<U>> {
         self.0.get(&type_id)
     }
@@ -95,7 +95,7 @@ where
 unsafe impl TypeDatabase for HashMapTypeDatabase {
     type Entry<U: ?Sized> = HashMapTypeDatabaseEntry<U>;
 
-    #[cfg_attr(feature = "trace", tracing::instrument(skip_all, fields(
+    #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, fields(
         U = type_name::<U>(),
     )))]
     fn get_entry_mut<U>(&mut self) -> &mut Self::Entry<U>
@@ -111,7 +111,7 @@ unsafe impl TypeDatabase for HashMapTypeDatabase {
         }
     }
 
-    #[cfg_attr(feature = "trace", tracing::instrument(skip_all, fields(
+    #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, fields(
         U = type_name::<U>(),
     )))]
     fn get_entry<U>(&self) -> Option<&Self::Entry<U>>
diff --git a/src/db/mod.rs b/src/db/mod.rs
@@ -17,7 +17,7 @@ use core::{
 };
 use error::{CastError, DatabaseEntryError, DatabaseError};
 
-#[cfg(feature = "trace")]
+#[cfg(feature = "tracing")]
 use core::any::type_name;
 
 /// A key-value store, where the key is the [`TypeId`] of a concrete Rust type
@@ -56,7 +56,7 @@ where
     U: ?Sized,
 {
     /// Register concrete type `I` as an implementor of `U`.
-    #[cfg_attr(feature = "trace", tracing::instrument(skip_all, fields(
+    #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, fields(
         U = type_name::<U>(),
         I = type_name::<I>(),
     )))]
@@ -72,7 +72,7 @@ where
     }
 
     /// Attempt to determine the concrete type of the given `data`.
-    #[cfg_attr(feature = "trace", tracing::instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", tracing::instrument(skip_all))]
     fn concrete_type_id<P>(&self, data: &P) -> Result<TypeId, DatabaseEntryError<U, P>>
     where
         P: ?Sized + InnermostTypeId,
@@ -81,7 +81,7 @@ where
     }
 
     /// Whether `data` is registered as an implementor of `U`.
-    #[cfg_attr(feature = "trace", tracing::instrument(skip_all, fields(
+    #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, fields(
         P = type_name::<P>(),
         U = type_name::<U>(),
     )))]
@@ -95,7 +95,7 @@ where
 
     /// Cast `pointer` to `P::Coerced<U>`, if registered as an implementor of
     /// `U`.
-    #[cfg_attr(feature = "trace", tracing::instrument(skip_all, fields(
+    #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, fields(
         P = type_name::<P>(),
         U = type_name::<U>(),
     )))]
@@ -170,7 +170,7 @@ where
 {
     /// Returns a shared/immutable reference to the value of the entry that is
     /// keyed by `U`.
-    #[cfg_attr(feature = "trace", tracing::instrument(skip_all, fields(
+    #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, fields(
         U = type_name::<U>(),
     )))]
     fn get_db_entry<U>(&self) -> Result<&Self::Entry<U>, DatabaseError<U>>
diff --git a/src/lib.rs b/src/lib.rs
@@ -102,7 +102,7 @@ pub mod container;
 pub mod db;
 
 #[doc(hidden)]
-#[cfg(feature = "trace")]
+#[cfg(feature = "tracing")]
 pub use tracing;
 
 use container::{Coerced, Coercible, InnermostTypeId, Metadata, Pointer};
@@ -115,7 +115,7 @@ use db::{
 #[cfg(any(feature = "global", doc))]
 use db::{error::DatabaseError, hash_map::DB};
 
-#[cfg(feature = "trace")]
+#[cfg(feature = "tracing")]
 use core::any::type_name;
 
 /// A type whose implementations can be dynamically determined.
@@ -125,7 +125,7 @@ where
     DB: TypeDatabaseExt,
 {
     /// Lookup whether `self`'s ultimate concrete type implements `U` in `db`.
-    #[cfg_attr(feature = "trace", tracing::instrument(skip_all, fields(
+    #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, fields(
         Self = type_name::<Self>(),
         U = type_name::<U>(),
     )))]
@@ -146,7 +146,7 @@ where
 {
     /// Cast `self`'s ultimate concrete type to `U`, if registered as an
     /// implementor of `U` in `db`.
-    #[cfg_attr(feature = "trace", tracing::instrument(skip_all, fields(
+    #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, fields(
         Self = type_name::<Self>(),
         U = type_name::<U>(),
     )))]
@@ -191,7 +191,7 @@ where
 {
     /// Lookup whether `self`'s ultimate concrete type implements `U` in the
     /// global [`DB`].
-    #[cfg_attr(feature = "trace", tracing::instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", tracing::instrument(skip_all))]
     fn dyn_implements<U>(&self) -> Result<bool, DatabaseEntryError<U, &Self>>
     where
         U: 'static + ?Sized,
@@ -211,7 +211,7 @@ where
 {
     /// Cast `self`'s ultimate concrete type to `U`, if registered as an
     /// implementor of `U` in the global [`DB`].
-    #[cfg_attr(feature = "trace", tracing::instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", tracing::instrument(skip_all))]
     fn dyn_cast<U>(self) -> Result<Self::Coerced<U>, CastError<U, Self>>
     where
         U: 'static + ?Sized,

Original file line number	Diff line number	Diff line change
`@@ -76,17 +76,17 @@ unsafe impl<U> TypeDatabaseEntry<U> for HashMapTypeDatabaseEntry<U>`
`76`	`76`	`where`
`77`	`77`	`U: ?Sized,`
`78`	`78`	`{`
`79`		`- #[cfg_attr(feature = "trace", tracing::instrument(skip(self, metadata)))]`
	`79`	`+ #[cfg_attr(feature = "tracing", tracing::instrument(skip(self, metadata)))]`
`80`	`80`	`unsafe fn add(&mut self, type_id: TypeId, metadata: Metadata<U>) {`
`81`	`81`	`let _ = self.0.insert(type_id, metadata);`
`82`	`82`	`}`
`83`	`83`
`84`		`- #[cfg_attr(feature = "trace", tracing::instrument(skip(self)))]`
	`84`	`+ #[cfg_attr(feature = "tracing", tracing::instrument(skip(self)))]`
`85`	`85`	`fn contains(&self, type_id: TypeId) -> bool {`
`86`	`86`	`self.0.contains_key(&type_id)`
`87`	`87`	`}`
`88`	`88`
`89`		`- #[cfg_attr(feature = "trace", tracing::instrument(skip(self)))]`
	`89`	`+ #[cfg_attr(feature = "tracing", tracing::instrument(skip(self)))]`
`90`	`90`	`fn metadata(&self, type_id: TypeId) -> Option<&Metadata<U>> {`
`91`	`91`	`self.0.get(&type_id)`
`92`	`92`	`}`
`@@ -95,7 +95,7 @@ where`
`95`	`95`	`unsafe impl TypeDatabase for HashMapTypeDatabase {`
`96`	`96`	`type Entry<U: ?Sized> = HashMapTypeDatabaseEntry<U>;`
`97`	`97`
`98`		`- #[cfg_attr(feature = "trace", tracing::instrument(skip_all, fields(`
	`98`	`+ #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, fields(`
`99`	`99`	`U = type_name::<U>(),`
`100`	`100`	`)))]`
`101`	`101`	`fn get_entry_mut<U>(&mut self) -> &mut Self::Entry<U>`
`@@ -111,7 +111,7 @@ unsafe impl TypeDatabase for HashMapTypeDatabase {`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
`114`		`- #[cfg_attr(feature = "trace", tracing::instrument(skip_all, fields(`
	`114`	`+ #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, fields(`
`115`	`115`	`U = type_name::<U>(),`
`116`	`116`	`)))]`
`117`	`117`	`fn get_entry<U>(&self) -> Option<&Self::Entry<U>>`