diff options
author | Aleksey Kladov <[email protected]> | 2019-11-21 09:21:46 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-11-21 10:25:03 +0000 |
commit | 0102fb41337ac0442e689d410bb424d215e9a7bd (patch) | |
tree | c77bf501427adc77c0fc92fe75fd9f314087b120 /crates/ra_hir/src/ty/method_resolution.rs | |
parent | 612a72fc4ea4376920f2a7da7b3c334227c1716c (diff) |
Decouple Resolver
Diffstat (limited to 'crates/ra_hir/src/ty/method_resolution.rs')
-rw-r--r-- | crates/ra_hir/src/ty/method_resolution.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs index f377fca48..26dd06171 100644 --- a/crates/ra_hir/src/ty/method_resolution.rs +++ b/crates/ra_hir/src/ty/method_resolution.rs | |||
@@ -224,7 +224,9 @@ fn iterate_trait_method_candidates<T>( | |||
224 | .trait_predicates_for_self_ty(&ty.value) | 224 | .trait_predicates_for_self_ty(&ty.value) |
225 | .map(|tr| tr.trait_) | 225 | .map(|tr| tr.trait_) |
226 | .flat_map(|t| t.all_super_traits(db)); | 226 | .flat_map(|t| t.all_super_traits(db)); |
227 | let traits = inherent_trait.chain(traits_from_env).chain(resolver.traits_in_scope(db)); | 227 | let traits = inherent_trait |
228 | .chain(traits_from_env) | ||
229 | .chain(resolver.traits_in_scope(db).into_iter().map(Trait::from)); | ||
228 | 'traits: for t in traits { | 230 | 'traits: for t in traits { |
229 | let data = t.trait_data(db); | 231 | let data = t.trait_data(db); |
230 | 232 | ||