diff options
Diffstat (limited to 'crates/ra_hir/src/ty/method_resolution.rs')
-rw-r--r-- | crates/ra_hir/src/ty/method_resolution.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs index 353820436..d421bf9ef 100644 --- a/crates/ra_hir/src/ty/method_resolution.rs +++ b/crates/ra_hir/src/ty/method_resolution.rs | |||
@@ -7,7 +7,7 @@ use std::sync::Arc; | |||
7 | use arrayvec::ArrayVec; | 7 | use arrayvec::ArrayVec; |
8 | use rustc_hash::FxHashMap; | 8 | use rustc_hash::FxHashMap; |
9 | 9 | ||
10 | use super::{autoderef, lower, Canonical, Environment, InEnvironment, TraitRef}; | 10 | use super::{autoderef, lower, Canonical, InEnvironment, TraitEnvironment, TraitRef}; |
11 | use crate::{ | 11 | use crate::{ |
12 | generics::HasGenericParams, | 12 | generics::HasGenericParams, |
13 | impl_block::{ImplBlock, ImplId, ImplItem}, | 13 | impl_block::{ImplBlock, ImplId, ImplItem}, |
@@ -214,7 +214,7 @@ fn iterate_trait_method_candidates<T>( | |||
214 | if name.map_or(true, |name| data.name() == name) && data.has_self_param() { | 214 | if name.map_or(true, |name| data.name() == name) && data.has_self_param() { |
215 | if !known_implemented { | 215 | if !known_implemented { |
216 | let goal = generic_implements_goal(db, env.clone(), t, ty.clone()); | 216 | let goal = generic_implements_goal(db, env.clone(), t, ty.clone()); |
217 | if db.solve(krate, goal).is_none() { | 217 | if db.trait_solve(krate, goal).is_none() { |
218 | continue 'traits; | 218 | continue 'traits; |
219 | } | 219 | } |
220 | } | 220 | } |
@@ -283,7 +283,7 @@ impl Ty { | |||
283 | /// for all other parameters, to query Chalk with it. | 283 | /// for all other parameters, to query Chalk with it. |
284 | fn generic_implements_goal( | 284 | fn generic_implements_goal( |
285 | db: &impl HirDatabase, | 285 | db: &impl HirDatabase, |
286 | env: Arc<Environment>, | 286 | env: Arc<TraitEnvironment>, |
287 | trait_: Trait, | 287 | trait_: Trait, |
288 | self_ty: Canonical<Ty>, | 288 | self_ty: Canonical<Ty>, |
289 | ) -> Canonical<InEnvironment<super::Obligation>> { | 289 | ) -> Canonical<InEnvironment<super::Obligation>> { |