Merge #1833

1833: Specify desirable namespace when calling resolve r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 4 insertions, 6 deletions

diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index c1938bd86..dad1c93c4 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -22,7 +22,7 @@ use crate::{
         U8, USIZE,
     },
     nameres::{CrateModuleId, ImportId, ModuleScope, Namespace},
-    resolve::Resolver,
+    resolve::{Resolver, TypeNs},
     traits::{TraitData, TraitItem},
     ty::{
         primitive::{FloatBitness, FloatTy, IntBitness, IntTy, Signedness},
@@ -868,11 +868,9 @@ impl Trait {
                 }
                 _ => None,
             })
-            .filter_map(|path| {
-                match resolver.resolve_path_without_assoc_items(db, path).take_types() {
-                    Some(crate::Resolution::Def(ModuleDef::Trait(t))) => Some(t),
-                    _ => None,
-                }
+            .filter_map(|path| match resolver.resolve_path_in_type_ns_fully(db, path) {
+                Some(TypeNs::Trait(t)) => Some(t),
+                _ => None,
             })
             .collect()
     }