rustc: make LocalDefId's index field public like DefId's is.

Author: eddyb

src/librustc/hir/def_id.rs

@@ -162,20 +162,24 @@ impl rustc_serialize::UseSpecializedDecodable for DefId {}
 /// and a DefId from a different crate would signify a bug somewhere. This
 /// is when LocalDefId comes in handy.
 #[derive(Clone, Copy, PartialEq, Eq, Hash)]
-pub struct LocalDefId(DefIndex);
+pub struct LocalDefId {
+    pub index: DefIndex,
+}
 
 impl LocalDefId {
     #[inline]
     pub fn from_def_id(def_id: DefId) -> LocalDefId {
         assert!(def_id.is_local());
-        LocalDefId(def_id.index)
+        LocalDefId {
+            index: def_id.index,
+        }
     }
 
     #[inline]
     pub fn to_def_id(self) -> DefId {
         DefId {
             krate: LOCAL_CRATE,
-            index: self.0
+            index: self.index
         }
     }
 }

src/librustc/hir/map/mod.rs

@@ -317,7 +317,7 @@ impl<'hir> Map<'hir> {
 
     #[inline]
     pub fn local_def_id_to_hir_id(&self, def_id: LocalDefId) -> HirId {
-        self.definitions.def_index_to_hir_id(def_id.to_def_id().index)
+        self.definitions.def_index_to_hir_id(def_id.index)
     }
 
     pub fn def_kind(&self, hir_id: HirId) -> Option<DefKind> {

src/librustc/hir/mod.rs

@@ -85,7 +85,9 @@ impl HirId {
     }
 
     pub fn owner_local_def_id(self) -> LocalDefId {
-        LocalDefId::from_def_id(DefId::local(self.owner))
+        LocalDefId {
+            index: self.owner,
+        }
     }
 }
 

src/librustc/ty/context.rs

@@ -797,7 +797,7 @@ impl<'a, 'tcx> HashStable<StableHashingContext<'a>> for TypeckTables<'tcx> {
                 };
                 let closure_def_id = DefId {
                     krate: local_id_root.krate,
-                    index: closure_expr_id.to_def_id().index,
+                    index: closure_expr_id.index,
                 };
                 (hcx.def_path_hash(var_owner_def_id),
                  var_path.hir_id.local_id,