diff options
| author | Bastian Kauschke <bastian_kauschke@hotmail.de> | 2020-07-15 10:53:11 +0200 |
|---|---|---|
| committer | Bastian Kauschke <bastian_kauschke@hotmail.de> | 2020-07-15 13:06:47 +0200 |
| commit | 8003ccfdcd5731fe00c48f477857bf5ad52c6146 (patch) | |
| tree | de8a26a0fc6ba22fee7c54f02255815001146bf4 | |
| parent | a909eb6b653080683b49b2be5e6621ca08cecf01 (diff) | |
| download | rust-8003ccfdcd5731fe00c48f477857bf5ad52c6146.tar.gz rust-8003ccfdcd5731fe00c48f477857bf5ad52c6146.zip | |
ty_def_id -> def_id_for_type_of
| -rw-r--r-- | src/librustc_middle/ty/mod.rs | 4 | ||||
| -rw-r--r-- | src/librustc_middle/ty/sty.rs | 2 | ||||
| -rw-r--r-- | src/librustc_mir/borrow_check/universal_regions.rs | 2 | ||||
| -rw-r--r-- | src/librustc_ty/instance.rs | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc_middle/ty/mod.rs b/src/librustc_middle/ty/mod.rs index 35b3ad66f01..26ce8e54a65 100644 --- a/src/librustc_middle/ty/mod.rs +++ b/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) } } diff --git a/src/librustc_middle/ty/sty.rs b/src/librustc_middle/ty/sty.rs index c968e2fbde8..8cdfe5e5ac6 100644 --- a/src/librustc_middle/ty/sty.rs +++ b/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 }), diff --git a/src/librustc_mir/borrow_check/universal_regions.rs b/src/librustc_mir/borrow_check/universal_regions.rs index 2faf7fa9022..55d817b3f1c 100644 --- a/src/librustc_mir/borrow_check/universal_regions.rs +++ b/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])) } diff --git a/src/librustc_ty/instance.rs b/src/librustc_ty/instance.rs index 6de08bd0489..1a3308468bb 100644 --- a/src/librustc_ty/instance.rs +++ b/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 { |