1 files changed, 11 insertions, 29 deletions

diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index 56ed872d5..e962bbd31 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -61,9 +61,9 @@ use ra_db::{FileId, Edition};
 use test_utils::tested_by;
 
 use crate::{
-    ModuleDef, Name, Crate, Module,
-    DefDatabase, Path, PathKind, HirFileId,
-    ids::{SourceItemId, SourceFileItemId, MacroCallId},
+    ModuleDef, Name, Crate, Module, SourceItemId,
+    DefDatabase, Path, PathKind, HirFileId, Trait,
+    ids::MacroDefId,
     diagnostics::DiagnosticSink,
     nameres::diagnostics::DefDiagnostic,
 };
@@ -84,9 +84,7 @@ pub struct CrateDefMap {
     extern_prelude: FxHashMap<Name, ModuleDef>,
     root: CrateModuleId,
     modules: Arena<CrateModuleId, ModuleData>,
-    macros: Arena<CrateMacroId, mbe::MacroRules>,
-    public_macros: FxHashMap<Name, CrateMacroId>,
-    macro_resolutions: FxHashMap<MacroCallId, (Crate, CrateMacroId)>,
+    public_macros: FxHashMap<Name, MacroDefId>,
     diagnostics: Vec<DefDiagnostic>,
 }
 
@@ -97,18 +95,6 @@ impl std::ops::Index<CrateModuleId> for CrateDefMap {
     }
 }
 
-impl std::ops::Index<CrateMacroId> for CrateDefMap {
-    type Output = mbe::MacroRules;
-    fn index(&self, id: CrateMacroId) -> &mbe::MacroRules {
-        &self.macros[id]
-    }
-}
-
-/// An ID of a macro, **local** to a specific crate
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub(crate) struct CrateMacroId(RawId);
-impl_arena_id!(CrateMacroId);
-
 /// An ID of a module, **local** to a specific crate
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub(crate) struct CrateModuleId(RawId);
@@ -139,6 +125,12 @@ impl ModuleScope {
     pub fn get(&self, name: &Name) -> Option<&Resolution> {
         self.items.get(name)
     }
+    pub fn traits<'a>(&'a self) -> impl Iterator<Item = Trait> + 'a {
+        self.items.values().filter_map(|r| match r.def.take_types() {
+            Some(ModuleDef::Trait(t)) => Some(t),
+            _ => None,
+        })
+    }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Default)]
@@ -196,9 +188,7 @@ impl CrateDefMap {
                 prelude: None,
                 root,
                 modules,
-                macros: Arena::default(),
                 public_macros: FxHashMap::default(),
-                macro_resolutions: FxHashMap::default(),
                 diagnostics: Vec::new(),
             }
         };
@@ -232,19 +222,11 @@ impl CrateDefMap {
         self.diagnostics.iter().for_each(|it| it.add_to(db, module, sink))
     }
 
-    pub(crate) fn resolve_macro(
-        &self,
-        macro_call_id: MacroCallId,
-    ) -> Option<(Crate, CrateMacroId)> {
-        self.macro_resolutions.get(&macro_call_id).map(|&it| it)
-    }
-
     pub(crate) fn find_module_by_source(
         &self,
         file_id: HirFileId,
-        decl_id: Option<SourceFileItemId>,
+        decl_id: Option<SourceItemId>,
     ) -> Option<CrateModuleId> {
-        let decl_id = decl_id.map(|it| it.with_file_id(file_id));
         let (module_id, _module_data) = self.modules.iter().find(|(_module_id, module_data)| {
             if decl_id.is_some() {
                 module_data.declaration == decl_id