simplyfiy local_def_id_to_hir_id

Author: ABouttefeux

compiler/rustc_hir/src/hir_id.rs

@@ -16,6 +16,10 @@ impl HirOwner {
     pub fn to_def_id(&self) -> DefId {
         self.def_id.to_def_id()
     }
+
+    pub fn to_hir_id(self) -> HirId {
+        HirId { owner: self, local_id: ItemLocalId::from_u32(0) }
+    }
 }
 
 impl rustc_index::vec::Idx for HirOwner {

compiler/rustc_incremental/src/persist/dirty_clean.rs

@@ -239,7 +239,7 @@ impl DirtyCleanVisitor<'tcx> {
     /// Return all DepNode labels that should be asserted for this item.
     /// index=0 is the "name" used for error messages
     fn auto_labels(&mut self, item_id: HirOwner, attr: &Attribute) -> (&'static str, Labels) {
-        let hir_id = self.tcx.hir().local_def_id_to_hir_id(item_id.def_id);
+        let hir_id = item_id.to_hir_id();
         let node = self.tcx.hir().get(hir_id);
         let (name, labels) = match node {
             HirNode::Item(item) => {

compiler/rustc_infer/src/infer/error_reporting/mod.rs

@@ -2052,7 +2052,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
             .in_progress_typeck_results
             .map(|typeck_results| typeck_results.borrow().hir_owner)
             .map(|owner| {
-                let hir_id = hir.local_def_id_to_hir_id(owner.def_id);
+                let hir_id = owner.to_hir_id();
                 let parent_id = hir.get_parent_item(hir_id);
                 (
                     // Parent item could be a `mod`, so we check the HIR before calling:

compiler/rustc_passes/src/diagnostic_items.rs

@@ -50,7 +50,7 @@ impl<'tcx> DiagnosticItemCollector<'tcx> {
     }
 
     fn observe_item(&mut self, def_id: HirOwner) {
-        let hir_id = self.tcx.hir().local_def_id_to_hir_id(def_id.def_id);
+        let hir_id = def_id.to_hir_id();
         let attrs = self.tcx.hir().attrs(hir_id);
         if let Some(name) = extract(&self.tcx.sess, attrs) {
             // insert into our table

compiler/rustc_resolve/src/late/lifetimes.rs

@@ -502,7 +502,7 @@ fn convert_named_region_map(named_region_map: NamedRegionMap) -> ResolveLifetime
 fn resolve_lifetimes_for<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> &'tcx ResolveLifetimes {
     let item_id = item_for(tcx, def_id);
     if item_id == def_id {
-        let item = tcx.hir().item(hir::ItemId { def_id: HirOwner { def_id: item_id } });
+        let item = tcx.hir().item(hir::ItemId { def_id: HirOwner { def_id } });
         match item.kind {
             hir::ItemKind::Trait(..) => tcx.resolve_lifetimes_trait_definition(item_id),
             _ => tcx.resolve_lifetimes(item_id),
@@ -760,11 +760,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
                 // their owner, we can keep going until we find the Item that owns that. We then
                 // conservatively add all resolved lifetimes. Otherwise we run into problems in
                 // cases like `type Foo<'a> = impl Bar<As = impl Baz + 'a>`.
-                for (_hir_id, node) in self
-                    .tcx
-                    .hir()
-                    .parent_iter(self.tcx.hir().local_def_id_to_hir_id(item.def_id.def_id))
-                {
+                for (_hir_id, node) in self.tcx.hir().parent_iter(item.def_id.to_hir_id()) {
                     match node {
                         hir::Node::Item(parent_item) => {
                             let resolved_lifetimes: &ResolveLifetimes = self