Stop using the hir_crate query in hir_walk_attributes

oli-obk · oli-obk · commit 04d077bd5b42 · 2025-06-05T14:01:55.000Z
diff --git a/compiler/rustc_middle/src/hir/map.rs b/compiler/rustc_middle/src/hir/map.rs
@@ -396,12 +396,9 @@ impl<'tcx> TyCtxt<'tcx> {
     where
         V: Visitor<'tcx>,
     {
-        let krate = self.hir_crate(());
-        for info in krate.owners.iter() {
-            if let MaybeOwner::Owner(info) = info {
-                for attrs in info.attrs.map.values() {
-                    walk_list!(visitor, visit_attribute, *attrs);
-                }
+        for owner in self.hir_crate_items(()).owners().chain(Some(CRATE_OWNER_ID)) {
+            for attrs in self.hir_attr_map(owner).map.values() {
+                walk_list!(visitor, visit_attribute, *attrs);
             }
         }
         V::Result::output()

Original file line number	Diff line number	Diff line change
`@@ -396,12 +396,9 @@ impl<'tcx> TyCtxt<'tcx> {`
`396`	`396`	`where`
`397`	`397`	`V: Visitor<'tcx>,`
`398`	`398`	`{`
`399`		`- let krate = self.hir_crate(());`
`400`		`- for info in krate.owners.iter() {`
`401`		`- if let MaybeOwner::Owner(info) = info {`
`402`		`- for attrs in info.attrs.map.values() {`
`403`		`- walk_list!(visitor, visit_attribute, *attrs);`
`404`		`- }`
	`399`	`+ for owner in self.hir_crate_items(()).owners().chain(Some(CRATE_OWNER_ID)) {`
	`400`	`+ for attrs in self.hir_attr_map(owner).map.values() {`
	`401`	`+ walk_list!(visitor, visit_attribute, *attrs);`
`405`	`402`	`}`
`406`	`403`	`}`
`407`	`404`	`V::Result::output()`