adapt to changes in gix-trace

Byron · Byron · commit bd6e3d7682d1 · 2023-06-17T10:09:33.000+02:00
diff --git a/src/shared.rs b/src/shared.rs
@@ -165,10 +165,8 @@ pub mod pretty {
                 let mut out = Vec::<u8>::new();
                 let mut err = Vec::<u8>::new();
 
-                let span = gix::trace::coarse!("run");
-                let res = run(progress::DoOrDiscard::from(Some(sub_progress)), &mut out, &mut err);
-                #[cfg(feature = "tracing")]
-                drop(span);
+                let res = gix::trace::coarse!("run")
+                    .into_scope(|| run(progress::DoOrDiscard::from(Some(sub_progress)), &mut out, &mut err));
 
                 handle.shutdown_and_wait();
                 std::io::Write::write_all(&mut stdout(), &out)?;
@@ -219,10 +217,9 @@ pub mod pretty {
                         // We might have something interesting to show, which would be hidden by the alternate screen if there is a progress TUI
                         // We know that the printing happens at the end, so this is fine.
                         let mut out = Vec::new();
-                        let span = gix::trace::coarse!("run", name = name);
-                        let res = run(progress::DoOrDiscard::from(Some(sub_progress)), &mut out, &mut stderr());
-                        #[cfg(feature = "tracing")]
-                        drop(span);
+                        let res = gix::trace::coarse!("run", name = name).into_scope(|| {
+                            run(progress::DoOrDiscard::from(Some(sub_progress)), &mut out, &mut stderr())
+                        });
                         tx.send(Event::ComputationDone(res, out)).ok();
                     }
                 });
