From 0efeec580a9cfa426e965af35747cef74d19191c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esteban=20K=C3=BCber?= <esteban@kuber.com.ar>
Date: Sun, 28 Sep 2025 23:04:50 +0000
Subject: [PATCH] Mention crate being analysized in query description

"running analysis passes on this crate" -> "running analysis passes on crate `foo`"

This message is displayed in cycle errors in particular, and in some cases without any spans or any other identifiable information to determine which dependency introduced the cycle.
---
 compiler/rustc_middle/src/query/mod.rs                       | 5 ++++-
 .../issue-24949-assoc-const-static-recursion-trait.stderr    | 2 +-
 tests/ui/consts/const-eval/const-eval-query-stack.stderr     | 2 +-
 tests/ui/consts/recursive-zst-static.default.stderr          | 2 +-
 tests/ui/consts/recursive-zst-static.unleash.stderr          | 2 +-
 tests/ui/track-diagnostics/track.stderr                      | 2 +-
 tests/ui/treat-err-as-bug/err.stderr                         | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/compiler/rustc_middle/src/query/mod.rs b/compiler/rustc_middle/src/query/mod.rs
index 30d4cc8b3c8d6..db2e252f9406a 100644
--- a/compiler/rustc_middle/src/query/mod.rs
+++ b/compiler/rustc_middle/src/query/mod.rs
@@ -397,7 +397,10 @@ rustc_queries! {
     /// The root query triggering all analysis passes like typeck or borrowck.
     query analysis(key: ()) {
         eval_always
-        desc { "running analysis passes on this crate" }
+        desc { |tcx|
+            "running analysis passes on crate `{}`",
+            tcx.crate_name(LOCAL_CRATE),
+        }
     }
 
     /// This query checks the fulfillment of collected lint expectations.
diff --git a/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr
index 317af7975aa7e..8197cfcba5025 100644
--- a/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr
+++ b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr
@@ -30,7 +30,7 @@ note: ...which requires elaborating drops for `<impl at $DIR/issue-24949-assoc-c
 LL |     const BAR: u32 = TRAIT_REF_BAR;
    |                      ^^^^^^^^^^^^^
    = note: ...which again requires simplifying constant for the type system `TRAIT_REF_BAR`, completing the cycle
-   = note: cycle used when running analysis passes on this crate
+   = note: cycle used when running analysis passes on crate `issue_24949_assoc_const_static_recursion_trait`
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/consts/const-eval/const-eval-query-stack.stderr b/tests/ui/consts/const-eval/const-eval-query-stack.stderr
index 96206dc5078bc..89f9c1e36920d 100644
--- a/tests/ui/consts/const-eval/const-eval-query-stack.stderr
+++ b/tests/ui/consts/const-eval/const-eval-query-stack.stderr
@@ -10,5 +10,5 @@ note: please make sure that you have updated to the latest nightly
 query stack during panic:
 #0 [eval_to_allocation_raw] const-evaluating + checking `X`
 #1 [eval_to_const_value_raw] simplifying constant for the type system `X`
-#2 [analysis] running analysis passes on this crate
+#2 [analysis] running analysis passes on crate `const_eval_query_stack`
 end of query stack
diff --git a/tests/ui/consts/recursive-zst-static.default.stderr b/tests/ui/consts/recursive-zst-static.default.stderr
index c814576dfd5b9..589ff44ccff1f 100644
--- a/tests/ui/consts/recursive-zst-static.default.stderr
+++ b/tests/ui/consts/recursive-zst-static.default.stderr
@@ -16,7 +16,7 @@ note: ...which requires evaluating initializer of static `B`...
 LL | static B: () = A;
    | ^^^^^^^^^^^^
    = note: ...which again requires evaluating initializer of static `A`, completing the cycle
-   = note: cycle used when running analysis passes on this crate
+   = note: cycle used when running analysis passes on crate `recursive_zst_static`
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
 error: aborting due to 2 previous errors
diff --git a/tests/ui/consts/recursive-zst-static.unleash.stderr b/tests/ui/consts/recursive-zst-static.unleash.stderr
index c814576dfd5b9..589ff44ccff1f 100644
--- a/tests/ui/consts/recursive-zst-static.unleash.stderr
+++ b/tests/ui/consts/recursive-zst-static.unleash.stderr
@@ -16,7 +16,7 @@ note: ...which requires evaluating initializer of static `B`...
 LL | static B: () = A;
    | ^^^^^^^^^^^^
    = note: ...which again requires evaluating initializer of static `A`, completing the cycle
-   = note: cycle used when running analysis passes on this crate
+   = note: cycle used when running analysis passes on crate `recursive_zst_static`
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
 error: aborting due to 2 previous errors
diff --git a/tests/ui/track-diagnostics/track.stderr b/tests/ui/track-diagnostics/track.stderr
index 76b4bd14f5cd6..ba314c14b37ef 100644
--- a/tests/ui/track-diagnostics/track.stderr
+++ b/tests/ui/track-diagnostics/track.stderr
@@ -41,7 +41,7 @@ note: compiler flags: ... -Z ui-testing ... -Z track-diagnostics
 
 query stack during panic:
 #0 [typeck] type-checking `main`
-#1 [analysis] running analysis passes on this crate
+#1 [analysis] running analysis passes on crate `track`
 end of query stack
 error: aborting due to 3 previous errors
 
diff --git a/tests/ui/treat-err-as-bug/err.stderr b/tests/ui/treat-err-as-bug/err.stderr
index 0052dd7562654..2a9935c5d22bd 100644
--- a/tests/ui/treat-err-as-bug/err.stderr
+++ b/tests/ui/treat-err-as-bug/err.stderr
@@ -9,5 +9,5 @@ error: the compiler unexpectedly panicked. this is a bug.
 
 query stack during panic:
 #0 [eval_static_initializer] evaluating initializer of static `C`
-#1 [analysis] running analysis passes on this crate
+#1 [analysis] running analysis passes on crate `err`
 end of query stack