diff options
author | Florian Diebold <[email protected]> | 2021-03-20 10:23:59 +0000 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2021-03-20 11:47:12 +0000 |
commit | 7ec3b66f7a3ac0a33cf435bc3596fdac542fc52a (patch) | |
tree | 70a77a26ca09d8d5cd843b1cd9d59af229cd0daf /crates/hir_ty/src/infer/expr.rs | |
parent | 8e7e405f6ab0c1ee10bfdd3d55a97628fe4cd6dd (diff) |
Turn Obligation into something similar to chalk_ir::DomainGoal
This includes starting to make use of Chalk's `Cast` trait.
Diffstat (limited to 'crates/hir_ty/src/infer/expr.rs')
-rw-r--r-- | crates/hir_ty/src/infer/expr.rs | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs index 93548b6c0..79bbc5dab 100644 --- a/crates/hir_ty/src/infer/expr.rs +++ b/crates/hir_ty/src/infer/expr.rs | |||
@@ -3,7 +3,7 @@ | |||
3 | use std::iter::{repeat, repeat_with}; | 3 | use std::iter::{repeat, repeat_with}; |
4 | use std::{mem, sync::Arc}; | 4 | use std::{mem, sync::Arc}; |
5 | 5 | ||
6 | use chalk_ir::{Mutability, TyVariableKind}; | 6 | use chalk_ir::{cast::Cast, Mutability, TyVariableKind}; |
7 | use hir_def::{ | 7 | use hir_def::{ |
8 | expr::{Array, BinaryOp, Expr, ExprId, Literal, Statement, UnaryOp}, | 8 | expr::{Array, BinaryOp, Expr, ExprId, Literal, Statement, UnaryOp}, |
9 | path::{GenericArg, GenericArgs}, | 9 | path::{GenericArg, GenericArgs}, |
@@ -21,7 +21,7 @@ use crate::{ | |||
21 | to_assoc_type_id, to_chalk_trait_id, | 21 | to_assoc_type_id, to_chalk_trait_id, |
22 | traits::{chalk::from_chalk, FnTrait, InEnvironment}, | 22 | traits::{chalk::from_chalk, FnTrait, InEnvironment}, |
23 | utils::{generics, variant_data, Generics}, | 23 | utils::{generics, variant_data, Generics}, |
24 | AdtId, Binders, CallableDefId, FnPointer, FnSig, Interner, Obligation, Rawness, Scalar, | 24 | AdtId, Binders, CallableDefId, DomainGoal, FnPointer, FnSig, Interner, Rawness, Scalar, |
25 | Substitution, TraitRef, Ty, TyKind, | 25 | Substitution, TraitRef, Ty, TyKind, |
26 | }; | 26 | }; |
27 | 27 | ||
@@ -90,10 +90,9 @@ impl<'a> InferenceContext<'a> { | |||
90 | Substitution::build_for_generics(&generic_params).push(ty.clone()).push(arg_ty).build(); | 90 | Substitution::build_for_generics(&generic_params).push(ty.clone()).push(arg_ty).build(); |
91 | 91 | ||
92 | let trait_env = Arc::clone(&self.trait_env); | 92 | let trait_env = Arc::clone(&self.trait_env); |
93 | let implements_fn_trait = Obligation::Trait(TraitRef { | 93 | let implements_fn_trait: DomainGoal = |
94 | trait_id: to_chalk_trait_id(fn_once_trait), | 94 | TraitRef { trait_id: to_chalk_trait_id(fn_once_trait), substitution: substs.clone() } |
95 | substitution: substs.clone(), | 95 | .cast(&Interner); |
96 | }); | ||
97 | let goal = self.canonicalizer().canonicalize_obligation(InEnvironment { | 96 | let goal = self.canonicalizer().canonicalize_obligation(InEnvironment { |
98 | value: implements_fn_trait.clone(), | 97 | value: implements_fn_trait.clone(), |
99 | environment: trait_env, | 98 | environment: trait_env, |
@@ -938,22 +937,20 @@ impl<'a> InferenceContext<'a> { | |||
938 | let generic_predicates = self.db.generic_predicates(def.into()); | 937 | let generic_predicates = self.db.generic_predicates(def.into()); |
939 | for predicate in generic_predicates.iter() { | 938 | for predicate in generic_predicates.iter() { |
940 | let predicate = predicate.clone().subst(parameters); | 939 | let predicate = predicate.clone().subst(parameters); |
941 | if let Some(obligation) = Obligation::from_predicate(predicate) { | 940 | self.obligations.push(predicate.cast(&Interner)); |
942 | self.obligations.push(obligation); | ||
943 | } | ||
944 | } | 941 | } |
945 | // add obligation for trait implementation, if this is a trait method | 942 | // add obligation for trait implementation, if this is a trait method |
946 | match def { | 943 | match def { |
947 | CallableDefId::FunctionId(f) => { | 944 | CallableDefId::FunctionId(f) => { |
948 | if let AssocContainerId::TraitId(trait_) = f.lookup(self.db.upcast()).container | 945 | if let AssocContainerId::TraitId(trait_) = f.lookup(self.db.upcast()).container |
949 | { | 946 | { |
950 | // construct a TraitDef | 947 | // construct a TraitRef |
951 | let substs = | 948 | let substs = |
952 | parameters.prefix(generics(self.db.upcast(), trait_.into()).len()); | 949 | parameters.prefix(generics(self.db.upcast(), trait_.into()).len()); |
953 | self.obligations.push(Obligation::Trait(TraitRef { | 950 | self.obligations.push( |
954 | trait_id: to_chalk_trait_id(trait_), | 951 | TraitRef { trait_id: to_chalk_trait_id(trait_), substitution: substs } |
955 | substitution: substs, | 952 | .cast(&Interner), |
956 | })); | 953 | ); |
957 | } | 954 | } |
958 | } | 955 | } |
959 | CallableDefId::StructId(_) | CallableDefId::EnumVariantId(_) => {} | 956 | CallableDefId::StructId(_) | CallableDefId::EnumVariantId(_) => {} |