1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs
index 5ad4f73ec..36189e20d 100644
--- a/crates/ra_hir/src/ty/infer.rs
+++ b/crates/ra_hir/src/ty/infer.rs
@@ -29,8 +29,8 @@ use test_utils::tested_by;
 use super::{
    autoderef, lower, method_resolution, op, primitive,
    traits::{Guidance, Obligation, ProjectionPredicate, Solution},
-    ApplicationTy, CallableDef, Environment, InEnvironment, ProjectionTy, Substs, TraitRef, Ty,
+    ApplicationTy, CallableDef, InEnvironment, ProjectionTy, Substs, TraitEnvironment, TraitRef,
-    TypableDef, TypeCtor,
+    Ty, TypableDef, TypeCtor,
 };
 use crate::{
    adt::VariantDef,
@@ -170,7 +170,7 @@ struct InferenceContext<'a, D: HirDatabase> {
    body: Arc<Body>,
    resolver: Resolver,
    var_unification_table: InPlaceUnificationTable<TypeVarId>,
-    trait_env: Arc<Environment>,
+    trait_env: Arc<TraitEnvironment>,
    obligations: Vec<Obligation>,
    method_resolutions: FxHashMap<ExprId, Function>,
    field_resolutions: FxHashMap<ExprId, StructField>,
@@ -345,7 +345,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
            let in_env = InEnvironment::new(self.trait_env.clone(), obligation.clone());
            let canonicalized = self.canonicalizer().canonicalize_obligation(in_env);
            let solution =
-                self.db.solve(self.resolver.krate().unwrap(), canonicalized.value.clone());
+                self.db.trait_solve(self.resolver.krate().unwrap(), canonicalized.value.clone());
            match solution {
                Some(Solution::Unique(substs)) => {

diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs index 5ad4f73ec..36189e20d 100644 --- a/crates/ra_hir/src/ty/infer.rs +++ b/crates/ra_hir/src/ty/infer.rs
@@ -29,8 +29,8 @@ use test_utils::tested_by;
29	use super::{	29	use super::{
30	autoderef, lower, method_resolution, op, primitive,	30	autoderef, lower, method_resolution, op, primitive,
31	traits::{Guidance, Obligation, ProjectionPredicate, Solution},	31	traits::{Guidance, Obligation, ProjectionPredicate, Solution},
32	ApplicationTy, CallableDef, Environment, InEnvironment, ProjectionTy, Substs, TraitRef, Ty,	32	ApplicationTy, CallableDef, InEnvironment, ProjectionTy, Substs, TraitEnvironment, TraitRef,
33	TypableDef, TypeCtor,	33	Ty, TypableDef, TypeCtor,
34	};	34	};
35	use crate::{	35	use crate::{
36	adt::VariantDef,	36	adt::VariantDef,
@@ -170,7 +170,7 @@ struct InferenceContext<'a, D: HirDatabase> {
170	body: Arc<Body>,	170	body: Arc<Body>,
171	resolver: Resolver,	171	resolver: Resolver,
172	var_unification_table: InPlaceUnificationTable<TypeVarId>,	172	var_unification_table: InPlaceUnificationTable<TypeVarId>,
173	trait_env: Arc<Environment>,	173	trait_env: Arc<TraitEnvironment>,
174	obligations: Vec<Obligation>,	174	obligations: Vec<Obligation>,
175	method_resolutions: FxHashMap<ExprId, Function>,	175	method_resolutions: FxHashMap<ExprId, Function>,
176	field_resolutions: FxHashMap<ExprId, StructField>,	176	field_resolutions: FxHashMap<ExprId, StructField>,
@@ -345,7 +345,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
345	let in_env = InEnvironment::new(self.trait_env.clone(), obligation.clone());	345	let in_env = InEnvironment::new(self.trait_env.clone(), obligation.clone());
346	let canonicalized = self.canonicalizer().canonicalize_obligation(in_env);	346	let canonicalized = self.canonicalizer().canonicalize_obligation(in_env);
347	let solution =	347	let solution =
348	self.db.solve(self.resolver.krate().unwrap(), canonicalized.value.clone());	348	self.db.trait_solve(self.resolver.krate().unwrap(), canonicalized.value.clone());
349		349
350	match solution {	350	match solution {
351	Some(Solution::Unique(substs)) => {	351	Some(Solution::Unique(substs)) => {