1 files changed, 15 insertions, 27 deletions

diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index 707556ef8..3874e28bf 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -1,16 +1,12 @@
 //! Name resolution.
 use std::sync::Arc;
 
-use ra_syntax::ast;
-
-use rustc_hash::FxHashMap;
+use rustc_hash::{FxHashMap, FxHashSet};
 
 use crate::{
     ModuleDef, Trait,
     code_model_api::Crate,
-    MacroCallId,
-    MacroCallLoc,
-    AstId,
+    MacroDefId,
     db::HirDatabase,
     name::{Name, KnownName},
     nameres::{PerNs, CrateDefMap, CrateModuleId},
@@ -134,16 +130,9 @@ impl Resolver {
         resolution
     }
 
-    pub fn resolve_macro_call(
-        &self,
-        db: &impl HirDatabase,
-        path: Option<Path>,
-        ast_id: AstId<ast::MacroCall>,
-    ) -> Option<MacroCallId> {
+    pub(crate) fn resolve_macro_call(&self, path: Option<Path>) -> Option<MacroDefId> {
         let name = path.and_then(|path| path.expand_macro_expr()).unwrap_or_else(Name::missing);
-        let def_id = self.module().and_then(|(module, _)| module.find_macro(&name))?;
-        let call_loc = MacroCallLoc { def: *def_id, ast_id }.id(db);
-        Some(call_loc)
+        self.module()?.0.find_macro(&name)
     }
 
     /// Returns the resolved path segments
@@ -193,19 +182,18 @@ impl Resolver {
         names
     }
 
-    pub(crate) fn traits_in_scope<'a>(&'a self) -> impl Iterator<Item = Trait> + 'a {
-        // FIXME prelude
-        self.scopes
-            .iter()
-            .rev()
-            .flat_map(|scope| {
-                match scope {
-                    Scope::ModuleScope(m) => Some(m.crate_def_map[m.module_id].scope.traits()),
-                    _ => None,
+    pub(crate) fn traits_in_scope(&self, db: &impl HirDatabase) -> FxHashSet<Trait> {
+        let mut traits = FxHashSet::default();
+        for scope in &self.scopes {
+            if let Scope::ModuleScope(m) = scope {
+                if let Some(prelude) = m.crate_def_map.prelude() {
+                    let prelude_def_map = db.crate_def_map(prelude.krate);
+                    traits.extend(prelude_def_map[prelude.module_id].scope.traits());
                 }
-                .into_iter()
-            })
-            .flatten()
+                traits.extend(m.crate_def_map[m.module_id].scope.traits());
+            }
+        }
+        traits
     }
 
     fn module(&self) -> Option<(&CrateDefMap, CrateModuleId)> {