diff options
author | Aleksey Kladov <[email protected]> | 2020-07-16 12:15:00 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-07-16 12:16:34 +0100 |
commit | b5ce84b17023d27f4e96ec7911aca712db0e000b (patch) | |
tree | 96f00583eaa8659a21960fa5fc4717d4d9bf0962 /crates/ra_hir_ty/src/infer/expr.rs | |
parent | b598ab8be46b50d5f407c3858c7b2c788328edc7 (diff) |
Align CallableDefId naming with other ids
Diffstat (limited to 'crates/ra_hir_ty/src/infer/expr.rs')
-rw-r--r-- | crates/ra_hir_ty/src/infer/expr.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs index ab586b018..731b062c2 100644 --- a/crates/ra_hir_ty/src/infer/expr.rs +++ b/crates/ra_hir_ty/src/infer/expr.rs | |||
@@ -17,7 +17,7 @@ use crate::{ | |||
17 | autoderef, method_resolution, op, | 17 | autoderef, method_resolution, op, |
18 | traits::{FnTrait, InEnvironment}, | 18 | traits::{FnTrait, InEnvironment}, |
19 | utils::{generics, variant_data, Generics}, | 19 | utils::{generics, variant_data, Generics}, |
20 | ApplicationTy, Binders, CallableDef, InferTy, IntTy, Mutability, Obligation, Rawness, Substs, | 20 | ApplicationTy, Binders, CallableDefId, InferTy, IntTy, Mutability, Obligation, Rawness, Substs, |
21 | TraitRef, Ty, TypeCtor, | 21 | TraitRef, Ty, TypeCtor, |
22 | }; | 22 | }; |
23 | 23 | ||
@@ -854,7 +854,7 @@ impl<'a> InferenceContext<'a> { | |||
854 | } | 854 | } |
855 | // add obligation for trait implementation, if this is a trait method | 855 | // add obligation for trait implementation, if this is a trait method |
856 | match def { | 856 | match def { |
857 | CallableDef::FunctionId(f) => { | 857 | CallableDefId::FunctionId(f) => { |
858 | if let AssocContainerId::TraitId(trait_) = | 858 | if let AssocContainerId::TraitId(trait_) = |
859 | f.lookup(self.db.upcast()).container | 859 | f.lookup(self.db.upcast()).container |
860 | { | 860 | { |
@@ -865,7 +865,7 @@ impl<'a> InferenceContext<'a> { | |||
865 | self.obligations.push(Obligation::Trait(TraitRef { trait_, substs })); | 865 | self.obligations.push(Obligation::Trait(TraitRef { trait_, substs })); |
866 | } | 866 | } |
867 | } | 867 | } |
868 | CallableDef::StructId(_) | CallableDef::EnumVariantId(_) => {} | 868 | CallableDefId::StructId(_) | CallableDefId::EnumVariantId(_) => {} |
869 | } | 869 | } |
870 | } | 870 | } |
871 | } | 871 | } |