bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename hir_attrs query as hir_attr_map.

Browse source 
To make room for the moving of `Map::attrs` to `TyCtxt::hir_attrs` in
the next commit. (It makes sense to rename the query, because it has
many fewer uses than the method.)
This commit is contained in:
Nicholas Nethercote 2025-02-24 13:01:43 +11:00
parent d2642abed3
commit 281af35cc3
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_lint/src/levels.rs
View file

@ -152,7 +152,7 @@ fn lints_that_dont_need_to_run(tcx: TyCtxt<'_>, (): ()) -> FxIndexSet<LintId> {
#[instrument(level = "trace", skip(tcx), ret)] #[instrument(level = "trace", skip(tcx), ret)]
fn shallow_lint_levels_on(tcx: TyCtxt<'_>, owner: hir::OwnerId) -> ShallowLintLevelMap { fn shallow_lint_levels_on(tcx: TyCtxt<'_>, owner: hir::OwnerId) -> ShallowLintLevelMap {
let store = unerased_lint_store(tcx.sess); let store = unerased_lint_store(tcx.sess);
let attrs = tcx.hir_attrs(owner); let attrs = tcx.hir_attr_map(owner);
let mut levels = LintLevelsBuilder { let mut levels = LintLevelsBuilder {
sess: tcx.sess, sess: tcx.sess,

2
compiler/rustc_middle/src/hir/map.rs
View file

@ -908,7 +908,7 @@ impl<'hir> Map<'hir> {
/// Given a node ID, gets a list of attributes associated with the AST /// Given a node ID, gets a list of attributes associated with the AST
/// corresponding to the node-ID. /// corresponding to the node-ID.
pub fn attrs(self, id: HirId) -> &'hir [Attribute] { pub fn attrs(self, id: HirId) -> &'hir [Attribute] {
self.tcx.hir_attrs(id.owner).get(id.local_id) self.tcx.hir_attr_map(id.owner).get(id.local_id)
} }
/// Gets the span of the definition of the specified HIR node. /// Gets the span of the definition of the specified HIR node.

2
compiler/rustc_middle/src/hir/mod.rs
View file

@ -202,7 +202,7 @@ pub fn provide(providers: &mut Providers) {
} }
}) })
}; };
providers.hir_attrs = |tcx, id| { providers.hir_attr_map = |tcx, id| {
tcx.hir_crate(()).owners[id.def_id].as_owner().map_or(AttributeMap::EMPTY, |o| &o.attrs) tcx.hir_crate(()).owners[id.def_id].as_owner().map_or(AttributeMap::EMPTY, |o| &o.attrs)
}; };
providers.def_span = |tcx, def_id| tcx.hir().span(tcx.local_def_id_to_hir_id(def_id)); providers.def_span = |tcx, def_id| tcx.hir().span(tcx.local_def_id_to_hir_id(def_id));

2
compiler/rustc_middle/src/query/mod.rs
View file

@ -198,7 +198,7 @@ rustc_queries! {
/// ///
/// This can be conveniently accessed by methods on `tcx.hir()`. /// This can be conveniently accessed by methods on `tcx.hir()`.
/// Avoid calling this query directly. /// Avoid calling this query directly.
query hir_attrs(key: hir::OwnerId) -> &'tcx hir::AttributeMap<'tcx> { query hir_attr_map(key: hir::OwnerId) -> &'tcx hir::AttributeMap<'tcx> {
desc { |tcx| "getting HIR owner attributes in `{}`", tcx.def_path_str(key) } desc { |tcx| "getting HIR owner attributes in `{}`", tcx.def_path_str(key) }
feedable feedable
} }

2
compiler/rustc_middle/src/ty/context.rs
View file

@ -1299,7 +1299,7 @@ impl<'tcx> TyCtxtFeed<'tcx, LocalDefId> {
), ),
bodies, bodies,
}))); })));
self.feed_owner_id().hir_attrs(attrs); self.feed_owner_id().hir_attr_map(attrs);
} }
} }

2
compiler/rustc_ty_utils/src/opaque_types.rs
View file

@ -187,7 +187,7 @@ impl<'tcx> OpaqueTypeCollector<'tcx> {
if !hir_id.is_owner() { if !hir_id.is_owner() {
return; return;
} }
let Some(defines) = self.tcx.hir_attrs(hir_id.owner).define_opaque else { let Some(defines) = self.tcx.hir_attr_map(hir_id.owner).define_opaque else {
return; return;
}; };
for &(span, define) in defines { for &(span, define) in defines {