New upstream version 1.63.0+dfsg1

[rustc.git] / vendor / tracing-tree / src / lib.rs

diff --git a/vendor/tracing-tree/src/lib.rs b/vendor/tracing-tree/src/lib.rs
index 9bb885876d3dc4ef60fd338f184e6d7406d241c7..dbacaa57e593d488f7149a77aaa23a8166bb3dfc 100644 (file)
--- a/vendor/tracing-tree/src/lib.rs
+++ b/vendor/tracing-tree/src/lib.rs
@@ -42,7 +42,6 @@ impl Visit for Data {
         self.kvs.push((field.name(), format!("{:?}", value)))
     }
 }
-
 #[derive(Debug)]
 pub struct HierarchicalLayer<W = fn() -> io::Stderr>
 where
@@ -209,7 +208,7 @@ where
 
     fn write_span_info<S>(&self, id: &Id, ctx: &Context<S>, style: SpanMode)
     where
-        S: Subscriber + for<'span> LookupSpan<'span> + fmt::Debug,
+        S: Subscriber + for<'span> LookupSpan<'span>,
     {
         let span = ctx
             .span(id)
@@ -277,13 +276,16 @@ where
 
 impl<S, W> Layer<S> for HierarchicalLayer<W>
 where
-    S: Subscriber + for<'span> LookupSpan<'span> + fmt::Debug,
+    S: Subscriber + for<'span> LookupSpan<'span>,
     W: for<'writer> MakeWriter<'writer> + 'static,
 {
     fn on_new_span(&self, attrs: &Attributes, id: &Id, ctx: Context<S>) {
-        let data = Data::new(attrs);
         let span = ctx.span(id).expect("in new_span but span does not exist");
-        span.extensions_mut().insert(data);
+        if span.extensions().get::<Data>().is_none() {
+            let data = Data::new(attrs);
+            span.extensions_mut().insert(data);
+        }
+
         if self.config.verbose_exit {
             if let Some(span) = span.parent() {
                 self.write_span_info(&span.id(), &ctx, SpanMode::PreOpen);