1 files changed, 8 insertions, 8 deletions

diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs
index 40f5eabf0..e214bf1af 100644
--- a/crates/ra_hir/src/ty/method_resolution.rs
+++ b/crates/ra_hir/src/ty/method_resolution.rs
@@ -211,8 +211,8 @@ fn iterate_trait_method_candidates<T>(
                 let data = m.data(db);
                 if name.map_or(true, |name| data.name() == name) && data.has_self_param() {
                     if !known_implemented {
-                        let trait_ref = canonical_trait_ref(db, env.clone(), t, ty.clone());
-                        if db.implements(krate, trait_ref).is_none() {
+                        let goal = generic_implements_goal(db, env.clone(), t, ty.clone());
+                        if db.solve(krate, goal).is_none() {
                             continue 'traits;
                         }
                     }
@@ -279,12 +279,12 @@ impl Ty {
 
 /// This creates Substs for a trait with the given Self type and type variables
 /// for all other parameters, to query Chalk with it.
-fn canonical_trait_ref(
+fn generic_implements_goal(
     db: &impl HirDatabase,
     env: Arc<Environment>,
     trait_: Trait,
     self_ty: Canonical<Ty>,
-) -> Canonical<InEnvironment<TraitRef>> {
+) -> Canonical<InEnvironment<super::Obligation>> {
     let mut substs = Vec::new();
     let generics = trait_.generic_params(db);
     let num_vars = self_ty.num_vars;
@@ -297,8 +297,8 @@ fn canonical_trait_ref(
             .enumerate()
             .map(|(i, _p)| Ty::Bound((i + num_vars) as u32)),
     );
-    Canonical {
-        num_vars: substs.len() - 1 + self_ty.num_vars,
-        value: InEnvironment::new(env, TraitRef { trait_, substs: substs.into() }),
-    }
+    let num_vars = substs.len() - 1 + self_ty.num_vars;
+    let trait_ref = TraitRef { trait_, substs: substs.into() };
+    let obligation = super::Obligation::Trait(trait_ref);
+    Canonical { num_vars, value: InEnvironment::new(env, obligation) }
 }