ty_def_id -> def_id_for_type_of

src/librustc_middle/ty/mod.rs

@@ -1623,7 +1623,7 @@ impl WithOptConstParam<LocalDefId> {
         WithOptConstParam { did: self.did.to_def_id(), const_param_did: self.const_param_did }
     }
 
-    pub fn ty_def_id(self) -> DefId {
+    pub fn def_id_for_type_of(self) -> DefId {
         if let Some(did) = self.const_param_did { did } else { self.did.to_def_id() }
     }
 }
@@ -1653,7 +1653,7 @@ impl WithOptConstParam<DefId> {
         self.did.is_local()
     }
 
-    pub fn ty_def_id(self) -> DefId {
+    pub fn def_id_for_type_of(self) -> DefId {
         self.const_param_did.unwrap_or(self.did)
     }
 }

src/librustc_middle/ty/sty.rs

@@ -2231,7 +2231,7 @@ impl<'tcx> Const<'tcx> {
 
         let expr = &tcx.hir().body(body_id).value;
 
-        let ty = tcx.type_of(def.ty_def_id());
+        let ty = tcx.type_of(def.def_id_for_type_of());
 
         let lit_input = match expr.kind {
             hir::ExprKind::Lit(ref lit) => Some(LitToConstInput { lit: &lit.node, ty, neg: false }),

src/librustc_mir/borrow_check/universal_regions.rs

@@ -636,7 +636,7 @@ impl<'cx, 'tcx> UniversalRegionsBuilder<'cx, 'tcx> {
                 // For a constant body, there are no inputs, and one
                 // "output" (the type of the constant).
                 assert_eq!(self.mir_def.did.to_def_id(), def_id);
-                let ty = tcx.type_of(self.mir_def.ty_def_id());
+                let ty = tcx.type_of(self.mir_def.def_id_for_type_of());
                 let ty = indices.fold_to_region_vids(tcx, &ty);
                 ty::Binder::dummy(tcx.intern_type_list(&[ty]))
             }

src/librustc_ty/instance.rs

@@ -50,7 +50,7 @@ fn inner_resolve_instance<'tcx>(
         let item = tcx.associated_item(def.did);
         resolve_associated_item(tcx, &item, param_env, trait_def_id, substs)
     } else {
-        let ty = tcx.type_of(def.ty_def_id());
+        let ty = tcx.type_of(def.def_id_for_type_of());
         let item_type = tcx.subst_and_normalize_erasing_regions(substs, param_env, &ty);
 
         let def = match item_type.kind {