fixup 1

nagisa · Jan 6, 2024 · 59b42fa · 59b42fa
1 parent 9e3a43e
commit 59b42fa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 21 deletions.
diff --git a/tracing-tracy/src/config.rs b/tracing-tracy/src/config.rs
@@ -38,8 +38,7 @@ pub trait Config {
     /// Specify the maximum number of stack frames that will be collected.
     ///
     /// Note that enabling callstack collection can and will introduce a non-trivial overhead at
-    /// every instrumentation point. Specifying 0 frames (which is the default) will disable stack
-    /// trace collection.
+    /// every instrumentation point. Specifying 0 frames will disable stack trace collection.
     ///
     /// Default implementation returns `0`.
     fn stack_depth(&self) -> u16 {
@@ -103,8 +102,7 @@ impl DynamicConfig {
     /// Specify the maximum number of stack frames that will be collected.
     ///
     /// Note that enabling callstack collection can and will introduce a non-trivial overhead at
-    /// every instrumentation point. Specifying 0 frames (which is the default) will disable stack
-    /// trace collection.
+    /// every instrumentation point. Specifying 0 frames will disable stack trace collection.
     ///
     /// Defaults to `0`.
     #[must_use]

diff --git a/tracing-tracy/src/lib.rs b/tracing-tracy/src/lib.rs
@@ -59,7 +59,6 @@ use tracing_core::{
 };
 use tracing_subscriber::fmt::format::FormatFields;
 use tracing_subscriber::{
-    fmt::FormattedFields,
     layer::{Context, Layer},
     registry,
 };
@@ -68,6 +67,8 @@ use utils::{StrCache, StrCacheGuard, VecCell};
 pub use client;
 mod config;
 
+type TracyFields<C> = tracing_subscriber::fmt::FormattedFields<<C as Config>::Formatter>;
+
 thread_local! {
     /// A stack of spans currently active on the current thread.
     static TRACY_SPAN_STACK: VecCell<(Span, u64)> = const { VecCell::new() };
@@ -171,13 +172,9 @@ where
         let Some(span) = ctx.span(id) else { return };
 
         let mut extensions = span.extensions_mut();
-        if extensions
-            .get_mut::<FormattedFields<C::Formatter>>()
-            .is_none()
-        {
-            let mut fields = FormattedFields::<C::Formatter>::new(
-                CACHE.with(|cache| cache.acquire().into_inner()),
-            );
+        if extensions.get_mut::<TracyFields<C>>().is_none() {
+            let mut fields =
+                TracyFields::<C>::new(CACHE.with(|cache| cache.acquire().into_inner()));
             if self
                 .config
                 .formatter()
@@ -193,12 +190,11 @@ where
         let Some(span) = ctx.span(id) else { return };
 
         let mut extensions = span.extensions_mut();
-        if let Some(fields) = extensions.get_mut::<FormattedFields<C::Formatter>>() {
+        if let Some(fields) = extensions.get_mut::<TracyFields<C>>() {
             let _ = self.config.formatter().add_fields(fields, values);
         } else {
-            let mut fields = FormattedFields::<C::Formatter>::new(
-                CACHE.with(|cache| cache.acquire().into_inner()),
-            );
+            let mut fields =
+                TracyFields::<C>::new(CACHE.with(|cache| cache.acquire().into_inner()));
             if self
                 .config
                 .formatter()
@@ -240,7 +236,7 @@ where
         let Some(span) = ctx.span(id) else { return };
 
         let extensions = span.extensions();
-        let fields = extensions.get::<FormattedFields<C::Formatter>>();
+        let fields = extensions.get::<TracyFields<C>>();
         let stack_frame = {
             let metadata = span.metadata();
             let file = metadata.file().unwrap_or("<not available>");
@@ -311,10 +307,7 @@ where
     fn on_close(&self, id: Id, ctx: Context<'_, S>) {
         let Some(span) = ctx.span(&id) else { return };
 
-        if let Some(fields) = span
-            .extensions_mut()
-            .get_mut::<FormattedFields<C::Formatter>>()
-        {
+        if let Some(fields) = span.extensions_mut().get_mut::<TracyFields<C>>() {
             let buf = mem::take(&mut fields.fields);
             CACHE.with(|cache| drop(StrCacheGuard::new(cache, buf)));
         };