about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <476013+matthiaskrgr@users.noreply.github.com>2025-06-11 22:58:28 +0200
committerGitHub <noreply@github.com>2025-06-11 22:58:28 +0200
commite2846d6b75c088f3eca75a4fee474fa677b62399 (patch)
tree707ad499d7cab783b2da4a5137b2c7b81e15a14a
parent507c57554d776c533c411fcb4585cfbe0bbe6b35 (diff)
parentcd04717899c3266ca0f1a8af8829ff6187a2266c (diff)
downloadrust-e2846d6b75c088f3eca75a4fee474fa677b62399.tar.gz
rust-e2846d6b75c088f3eca75a4fee474fa677b62399.zip
Rollup merge of #142356 - Stypox:fix-enter_trace_span, r=RalfJung
Fix enter_trace_span!() using wrong $crate paths

This is a followup to rust-lang/rust#140972, where I made a silly mistake and forgot to update `$crate::interpret::tracing_utils::...` to `$crate::interpret::util::...` inside the macro after moving the referenced code from `tracing_utils.rs` to `util.rs`. Sorry about this.

r? `@RalfJung`
-rw-r--r--compiler/rustc_const_eval/src/interpret/util.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/util.rs b/compiler/rustc_const_eval/src/interpret/util.rs
index 83a17092619..99add01f95c 100644
--- a/compiler/rustc_const_eval/src/interpret/util.rs
+++ b/compiler/rustc_const_eval/src/interpret/util.rs
@@ -58,9 +58,9 @@ pub enum MaybeEnteredSpan {
 macro_rules! enter_trace_span {
     ($machine:ident, $($tt:tt)*) => {
         if $machine::TRACING_ENABLED {
-            $crate::interpret::tracing_utils::MaybeEnteredSpan::Some(tracing::info_span!($($tt)*).entered())
+            $crate::interpret::util::MaybeEnteredSpan::Some(tracing::info_span!($($tt)*).entered())
         } else {
-            $crate::interpret::tracing_utils::MaybeEnteredSpan::None
+            $crate::interpret::util::MaybeEnteredSpan::None
         }
     }
 }