Make all borrow tracker tracing spans have same name

... but the function name is specified in the arguments, see rust-lang#4452 (comment)

Author: Stypox

src/borrow_tracker/mod.rs

@@ -261,8 +261,11 @@ impl GlobalStateInner {
         machine: &MiriMachine<'_>,
     ) -> AllocState {
         let _span = enter_trace_span!(
-            "borrow_tracker::new_allocation",
-            "id = {id:?}, size = {alloc_size:?}, kind = {kind:?}"
+            "borrow_tracker",
+            borrow_tracker_fun = %"new_allocation",
+            ?id,
+            ?alloc_size,
+            ?kind,
         );
         match self.borrow_tracker_method {
             BorrowTrackerMethod::StackedBorrows =>
@@ -285,9 +288,10 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         val: &ImmTy<'tcx>,
     ) -> InterpResult<'tcx, ImmTy<'tcx>> {
         let _span = enter_trace_span!(
-            "borrow_tracker::retag_ptr_value",
-            "kind = {kind:?}, val.layout = {:?}",
-            val.layout
+            "borrow_tracker",
+            borrow_tracker_fun = %"retag_ptr_value",
+            ?kind,
+            ?val.layout,
         );
         let this = self.eval_context_mut();
         let method = this.machine.borrow_tracker.as_ref().unwrap().borrow().borrow_tracker_method;
@@ -303,8 +307,10 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         place: &PlaceTy<'tcx>,
     ) -> InterpResult<'tcx> {
         let _span = enter_trace_span!(
-            "borrow_tracker::retag_place_contents",
-            "kind = {kind:?}, place = {place:?}"
+            "borrow_tracker",
+            borrow_tracker_fun = %"retag_place_contents",
+            ?kind,
+            ?place,
         );
         let this = self.eval_context_mut();
         let method = this.machine.borrow_tracker.as_ref().unwrap().borrow().borrow_tracker_method;
@@ -315,7 +321,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
     }
 
     fn protect_place(&mut self, place: &MPlaceTy<'tcx>) -> InterpResult<'tcx, MPlaceTy<'tcx>> {
-        let _span = enter_trace_span!("borrow_tracker::protect_place", "place = {place:?}");
+        let _span =
+            enter_trace_span!("borrow_tracker", borrow_tracker_fun = %"protect_place", ?place);
         let this = self.eval_context_mut();
         let method = this.machine.borrow_tracker.as_ref().unwrap().borrow().borrow_tracker_method;
         match method {
@@ -326,10 +333,10 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
 
     fn expose_tag(&self, alloc_id: AllocId, tag: BorTag) -> InterpResult<'tcx> {
         let _span = enter_trace_span!(
-            "borrow_tracker::expose_tag",
-            "alloc_id = {}, tag = {}",
-            alloc_id.0,
-            tag.0
+            "borrow_tracker",
+            borrow_tracker_fun = %"expose_tag",
+            alloc_id = alloc_id.0,
+            tag = tag.0,
         );
         let this = self.eval_context_ref();
         let method = this.machine.borrow_tracker.as_ref().unwrap().borrow().borrow_tracker_method;
@@ -374,7 +381,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         &self,
         frame: &Frame<'tcx, Provenance, FrameExtra<'tcx>>,
     ) -> InterpResult<'tcx> {
-        let _span = enter_trace_span!("borrow_tracker::on_stack_pop");
+        let _span = enter_trace_span!("borrow_tracker", borrow_tracker_fun = %"on_stack_pop");
         let this = self.eval_context_ref();
         let borrow_tracker = this.machine.borrow_tracker.as_ref().unwrap();
         // The body of this loop needs `borrow_tracker` immutably
@@ -452,7 +459,11 @@ impl AllocState {
         range: AllocRange,
         machine: &MiriMachine<'tcx>,
     ) -> InterpResult<'tcx> {
-        let _span = enter_trace_span!("borrow_tracker::before_memory_read");
+        let _span = enter_trace_span!(
+            "borrow_tracker",
+            borrow_tracker_fun = %"before_memory_read",
+            alloc_id = alloc_id.0
+        );
         match self {
             AllocState::StackedBorrows(sb) =>
                 sb.borrow_mut().before_memory_read(alloc_id, prov_extra, range, machine),
@@ -474,7 +485,11 @@ impl AllocState {
         range: AllocRange,
         machine: &MiriMachine<'tcx>,
     ) -> InterpResult<'tcx> {
-        let _span = enter_trace_span!("borrow_tracker::before_memory_write");
+        let _span = enter_trace_span!(
+            "borrow_tracker",
+            borrow_tracker_fun = %"before_memory_write",
+            alloc_id = alloc_id.0
+        );
         match self {
             AllocState::StackedBorrows(sb) =>
                 sb.get_mut().before_memory_write(alloc_id, prov_extra, range, machine),
@@ -496,7 +511,11 @@ impl AllocState {
         size: Size,
         machine: &MiriMachine<'tcx>,
     ) -> InterpResult<'tcx> {
-        let _span = enter_trace_span!("borrow_tracker::before_memory_deallocation");
+        let _span = enter_trace_span!(
+            "borrow_tracker",
+            borrow_tracker_fun = %"before_memory_deallocation",
+            alloc_id = alloc_id.0
+        );
         match self {
             AllocState::StackedBorrows(sb) =>
                 sb.get_mut().before_memory_deallocation(alloc_id, prov_extra, size, machine),
@@ -506,7 +525,8 @@ impl AllocState {
     }
 
     pub fn remove_unreachable_tags(&self, tags: &FxHashSet<BorTag>) {
-        let _span = enter_trace_span!("borrow_tracker::remove_unreachable_tags");
+        let _span =
+            enter_trace_span!("borrow_tracker", borrow_tracker_fun = %"remove_unreachable_tags");
         match self {
             AllocState::StackedBorrows(sb) => sb.borrow_mut().remove_unreachable_tags(tags),
             AllocState::TreeBorrows(tb) => tb.borrow_mut().remove_unreachable_tags(tags),
@@ -521,7 +541,12 @@ impl AllocState {
         tag: BorTag,
         alloc_id: AllocId, // diagnostics
     ) -> InterpResult<'tcx> {
-        let _span = enter_trace_span!("borrow_tracker::release_protector");
+        let _span = enter_trace_span!(
+            "borrow_tracker",
+            borrow_tracker_fun = %"release_protector",
+            alloc_id = alloc_id.0,
+            tag = tag.0
+        );
         match self {
             AllocState::StackedBorrows(_sb) => interp_ok(()),
             AllocState::TreeBorrows(tb) =>
@@ -532,7 +557,7 @@ impl AllocState {
 
 impl VisitProvenance for AllocState {
     fn visit_provenance(&self, visit: &mut VisitWith<'_>) {
-        let _span = enter_trace_span!("borrow_tracker::visit_provenance");
+        let _span = enter_trace_span!("borrow_tracker", borrow_tracker_fun = %"visit_provenance");
         match self {
             AllocState::StackedBorrows(sb) => sb.visit_provenance(visit),
             AllocState::TreeBorrows(tb) => tb.visit_provenance(visit),