hir atribute map to HirOwner

Author: ABouttefeux

compiler/rustc_hir/src/hir.rs

@@ -2055,7 +2055,6 @@ pub enum TraitItemKind<'hir> {
 // The bodies for items are stored "out of line", in a separate
 // hashmap in the `Crate`. Here we just record the hir-id of the item
 // so it can fetched later.
-/// TODO review
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Encodable, Debug)]
 pub struct ImplItemId {
     pub def_id: HirOwner,
@@ -2654,7 +2653,6 @@ impl VariantData<'hir> {
 // The bodies for items are stored "out of line", in a separate
 // hashmap in the `Crate`. Here we just record the hir-id of the item
 // so it can fetched later.
-/// TODO review
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Encodable, Debug, Hash)]
 pub struct ItemId {
     pub def_id: HirOwner,
@@ -2860,7 +2858,6 @@ pub enum AssocItemKind {
 // The bodies for items are stored "out of line", in a separate
 // hashmap in the `Crate`. Here we just record the hir-id of the item
 // so it can fetched later.
-// TODO review
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Encodable, Debug)]
 pub struct ForeignItemId {
     pub def_id: HirOwner,

compiler/rustc_hir/src/hir_id.rs

@@ -3,7 +3,6 @@ use rustc_index::vec::IndexVec;
 use rustc_serialize::{Decodable, Decoder, Encodable, Encoder};
 use std::fmt;
 
-/// TODO
 #[derive(Copy, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, Hash)]
 pub struct HirOwner {
     pub def_id: LocalDefId,

compiler/rustc_middle/src/hir/map/mod.rs

@@ -814,7 +814,7 @@ impl<'hir> Map<'hir> {
     /// Given a node ID, gets a list of attributes associated with the AST
     /// corresponding to the node-ID.
     pub fn attrs(&self, id: HirId) -> &'hir [ast::Attribute] {
-        self.tcx.hir_attrs(id.owner.def_id).get(id.local_id)
+        self.tcx.hir_attrs(id.owner).get(id.local_id)
     }
 
     /// Gets the span of the definition of the specified HIR node.
@@ -953,7 +953,7 @@ pub(super) fn crate_hash(tcx: TyCtxt<'_>, crate_num: CrateNum) -> Svh {
             let def_path_hash = tcx.definitions.def_path_hash(def_id.def_id);
             let mut hasher = StableHasher::new();
             hod.with_bodies.as_ref()?.hash_stable(&mut hcx, &mut hasher);
-            AttributeMap { map: &tcx.untracked_crate.attrs, prefix: def_id.def_id }
+            AttributeMap { map: &tcx.untracked_crate.attrs, prefix: def_id }
                 .hash_stable(&mut hcx, &mut hasher);
             Some((def_path_hash, hasher.finish()))
         })

compiler/rustc_middle/src/hir/mod.rs

@@ -69,7 +69,7 @@ impl<'a, 'tcx> HashStable<StableHashingContext<'a>> for OwnerNodes<'tcx> {
 #[derive(Copy, Clone)]
 pub struct AttributeMap<'tcx> {
     map: &'tcx BTreeMap<HirId, &'tcx [Attribute]>,
-    prefix: LocalDefId,
+    prefix: HirOwner,
 }
 
 impl<'a, 'tcx> HashStable<StableHashingContext<'a>> for AttributeMap<'tcx> {
@@ -95,21 +95,17 @@ impl<'tcx> std::fmt::Debug for AttributeMap<'tcx> {
 
 impl<'tcx> AttributeMap<'tcx> {
     fn get(&self, id: ItemLocalId) -> &'tcx [Attribute] {
-        self.map
-            .get(&HirId { owner: HirOwner { def_id: self.prefix }, local_id: id })
-            .copied()
-            .unwrap_or(&[])
+        self.map.get(&HirId { owner: self.prefix, local_id: id }).copied().unwrap_or(&[])
     }
 
     fn range(&self) -> std::collections::btree_map::Range<'_, rustc_hir::HirId, &[Attribute]> {
         let local_zero = ItemLocalId::from_u32(0);
-        let range = HirId { owner: HirOwner { def_id: self.prefix }, local_id: local_zero }
-            ..HirId {
-                owner: HirOwner {
-                    def_id: LocalDefId { local_def_index: self.prefix.local_def_index + 1 },
-                },
-                local_id: local_zero,
-            };
+        let range = HirId { owner: self.prefix, local_id: local_zero }..HirId {
+            owner: HirOwner {
+                def_id: LocalDefId { local_def_index: self.prefix.def_id.local_def_index + 1 },
+            },
+            local_id: local_zero,
+        };
         self.map.range(range)
     }
 }

compiler/rustc_middle/src/query/mod.rs

@@ -74,7 +74,7 @@ rustc_queries! {
     ///
     /// This can be conveniently accessed by methods on `tcx.hir()`.
     /// Avoid calling this query directly.
-    query hir_attrs(key: LocalDefId) -> rustc_middle::hir::AttributeMap<'tcx> {
+    query hir_attrs(key: HirOwner) -> rustc_middle::hir::AttributeMap<'tcx> {
         eval_always
         desc { |tcx| "HIR owner attributes in `{}`", tcx.def_path_str(key.to_def_id()) }
     }