rustc: rename DefId::to_local to assert_local and use it instead of LocalDefId::from_def_id.

Author: eddyb

src/librustc/dep_graph/dep_node.rs

@@ -449,7 +449,7 @@ impl RecoverKey<'tcx> for DefId {
 
 impl RecoverKey<'tcx> for LocalDefId {
     fn recover(tcx: TyCtxt<'tcx>, dep_node: &DepNode) -> Option<Self> {
-        dep_node.extract_def_id(tcx).map(|id| id.to_local())
+        dep_node.extract_def_id(tcx).map(|id| id.assert_local())
     }
 }
 

src/librustc/hir/def_id.rs

@@ -139,8 +139,11 @@ impl DefId {
     }
 
     #[inline]
-    pub fn to_local(self) -> LocalDefId {
-        LocalDefId::from_def_id(self)
+    pub fn assert_local(self) -> LocalDefId {
+        assert!(self.is_local());
+        LocalDefId {
+            index: self.index,
+        }
     }
 
     pub fn describe_as_module(&self, tcx: TyCtxt<'_>) -> String {
@@ -167,14 +170,6 @@ pub struct LocalDefId {
 }
 
 impl LocalDefId {
-    #[inline]
-    pub fn from_def_id(def_id: DefId) -> LocalDefId {
-        assert!(def_id.is_local());
-        LocalDefId {
-            index: def_id.index,
-        }
-    }
-
     #[inline]
     pub fn to_def_id(self) -> DefId {
         DefId {

src/librustc/middle/expr_use_visitor.rs

@@ -622,7 +622,7 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> {
             for &var_id in upvars.keys() {
                 let upvar_id = ty::UpvarId {
                     var_path: ty::UpvarPath { hir_id: var_id },
-                    closure_expr_id: closure_def_id.to_local(),
+                    closure_expr_id: closure_def_id.assert_local(),
                 };
                 let upvar_capture = self.mc.tables.upvar_capture(upvar_id);
                 let cmt_var = return_if_err!(self.cat_captured_var(closure_expr.hir_id,

src/librustc/middle/mem_categorization.rs

@@ -59,7 +59,7 @@ pub use self::Note::*;
 use self::Aliasability::*;
 
 use crate::middle::region;
-use crate::hir::def_id::{DefId, LocalDefId};
+use crate::hir::def_id::DefId;
 use crate::hir::Node;
 use crate::infer::InferCtxt;
 use crate::hir::def::{CtorOf, Res, DefKind, CtorKind};
@@ -723,7 +723,7 @@ impl<'a, 'tcx> MemCategorizationContext<'a, 'tcx> {
 
         let closure_expr_def_id = self.body_owner;
         let fn_hir_id = self.tcx.hir().local_def_id_to_hir_id(
-            LocalDefId::from_def_id(closure_expr_def_id),
+            closure_expr_def_id.assert_local(),
         );
         let ty = self.node_ty(fn_hir_id)?;
         let kind = match ty.kind {
@@ -747,7 +747,7 @@ impl<'a, 'tcx> MemCategorizationContext<'a, 'tcx> {
 
         let upvar_id = ty::UpvarId {
             var_path: ty::UpvarPath { hir_id: var_id },
-            closure_expr_id: closure_expr_def_id.to_local(),
+            closure_expr_id: closure_expr_def_id.assert_local(),
         };
 
         let var_ty = self.node_ty(var_id)?;

src/librustc/ty/query/on_disk_cache.rs

@@ -658,7 +658,7 @@ impl<'a, 'tcx> SpecializedDecoder<DefId> for CacheDecoder<'a, 'tcx> {
 impl<'a, 'tcx> SpecializedDecoder<LocalDefId> for CacheDecoder<'a, 'tcx> {
     #[inline]
     fn specialized_decode(&mut self) -> Result<LocalDefId, Self::Error> {
-        Ok(LocalDefId::from_def_id(DefId::decode(self)?))
+        Ok(DefId::decode(self)?.assert_local())
     }
 }
 

src/librustc_metadata/decoder.rs

@@ -287,7 +287,7 @@ impl<'a, 'tcx> SpecializedDecoder<DefIndex> for DecodeContext<'a, 'tcx> {
 impl<'a, 'tcx> SpecializedDecoder<LocalDefId> for DecodeContext<'a, 'tcx> {
     #[inline]
     fn specialized_decode(&mut self) -> Result<LocalDefId, Self::Error> {
-        self.specialized_decode().map(|i| LocalDefId::from_def_id(i))
+        Ok(DefId::decode(self)?.assert_local())
     }
 }
 

src/librustc_mir/borrow_check/nll/universal_regions.rs

@@ -784,7 +784,7 @@ fn for_each_late_bound_region_defined_on<'tcx>(
     fn_def_id: DefId,
     mut f: impl FnMut(ty::Region<'tcx>),
 ) {
-    if let Some(late_bounds) = tcx.is_late_bound_map(fn_def_id.to_local()) {
+    if let Some(late_bounds) = tcx.is_late_bound_map(fn_def_id.assert_local()) {
         for late_bound in late_bounds.iter() {
             let hir_id = HirId {
                 owner: fn_def_id.index,

src/librustc_mir/hair/cx/expr.rs

@@ -10,7 +10,6 @@ use rustc::ty::{self, AdtKind, Ty};
 use rustc::ty::adjustment::{Adjustment, Adjust, AutoBorrow, AutoBorrowMutability, PointerCast};
 use rustc::ty::subst::{InternalSubsts, SubstsRef};
 use rustc::hir;
-use rustc::hir::def_id::LocalDefId;
 use rustc::mir::BorrowKind;
 use syntax_pos::Span;
 
@@ -984,7 +983,7 @@ fn convert_var(
             let closure_def_id = cx.body_owner;
             let upvar_id = ty::UpvarId {
                 var_path: ty::UpvarPath {hir_id: var_hir_id},
-                closure_expr_id: LocalDefId::from_def_id(closure_def_id),
+                closure_expr_id: closure_def_id.assert_local(),
             };
             let var_ty = cx.tables().node_type(var_hir_id);
 
@@ -1185,7 +1184,7 @@ fn capture_upvar<'tcx>(
 ) -> ExprRef<'tcx> {
     let upvar_id = ty::UpvarId {
         var_path: ty::UpvarPath { hir_id: var_hir_id },
-        closure_expr_id: cx.tcx.hir().local_def_id(closure_expr.hir_id).to_local(),
+        closure_expr_id: cx.tcx.hir().local_def_id(closure_expr.hir_id).assert_local(),
     };
     let upvar_capture = cx.tables().upvar_capture(upvar_id);
     let temp_lifetime = cx.region_scope_tree.temporary_scope(closure_expr.hir_id.local_id);

src/librustc_typeck/check/upvar.rs

@@ -133,7 +133,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     var_path: ty::UpvarPath {
                         hir_id: var_hir_id,
                     },
-                    closure_expr_id: LocalDefId::from_def_id(closure_def_id),
+                    closure_expr_id: closure_def_id.assert_local(),
                 };
                 debug!("seed upvar_id {:?}", upvar_id);
                 // Adding the upvar Id to the list of Upvars, which will be added
@@ -261,7 +261,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     let upvar_ty = self.node_ty(var_hir_id);
                     let upvar_id = ty::UpvarId {
                         var_path: ty::UpvarPath { hir_id: var_hir_id },
-                        closure_expr_id: LocalDefId::from_def_id(closure_def_id),
+                        closure_expr_id: closure_def_id.assert_local(),
                     };
                     let capture = self.tables.borrow().upvar_capture(upvar_id);