about summary refs log tree commit diff
path: root/compiler/rustc_query_system
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-03-27 18:33:31 +0000
committerbors <bors@rust-lang.org>2025-03-27 18:33:31 +0000
commit3f5502370b8f60e4df98deba4c22ea26f4f6be55 (patch)
tree3fe8d3b8820e6927a39e17138439874fc54298bd /compiler/rustc_query_system
parent217693a1f02ca6431a434926ff3417bdb6dbac2e (diff)
parent1b8089d553f284a0cd6f2969a89459f3e1cf824b (diff)
downloadrust-3f5502370b8f60e4df98deba4c22ea26f4f6be55.tar.gz
rust-3f5502370b8f60e4df98deba4c22ea26f4f6be55.zip
Auto merge of #139023 - jhpratt:rollup-4ou6ei4, r=jhpratt
Rollup of 7 pull requests

Successful merges:

 - #138844 (expand: Leave traces when expanding `cfg` attributes)
 - #138926 (Remove `kw::Empty` uses from `rustc_middle`.)
 - #138989 (Clean up a few things in rustc_hir_analysis::check::region)
 - #138999 (Report compiletest pass mode if forced)
 - #139014 (Improve suggest construct with literal syntax instead of calling)
 - #139015 (Remove unneeded LLVM CI test assertions)
 - #139016 (Add job duration changes to post-merge analysis report)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_query_system')
-rw-r--r--compiler/rustc_query_system/src/ich/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_query_system/src/ich/mod.rs b/compiler/rustc_query_system/src/ich/mod.rs
index 852d93b711f..25778add60a 100644
--- a/compiler/rustc_query_system/src/ich/mod.rs
+++ b/compiler/rustc_query_system/src/ich/mod.rs
@@ -8,7 +8,7 @@ mod hcx;
 mod impls_syntax;
 
 pub const IGNORED_ATTRIBUTES: &[Symbol] = &[
-    sym::cfg,
+    sym::cfg_trace, // FIXME should this really be ignored?
     sym::rustc_if_this_changed,
     sym::rustc_then_this_would_need,
     sym::rustc_dirty,