diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs index 36ef615a3a..e962bbd311 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs @@ -63,7 +63,7 @@ use test_utils::tested_by; use crate::{ ModuleDef, Name, Crate, Module, SourceItemId, DefDatabase, Path, PathKind, HirFileId, Trait, - ids::{MacroCallId, MacroDefId}, + ids::MacroDefId, diagnostics::DiagnosticSink, nameres::diagnostics::DefDiagnostic, }; @@ -84,9 +84,7 @@ pub struct CrateDefMap { extern_prelude: FxHashMap, root: CrateModuleId, modules: Arena, - macros: Arena, public_macros: FxHashMap, - macro_resolutions: FxHashMap, diagnostics: Vec, } @@ -97,18 +95,6 @@ impl std::ops::Index for CrateDefMap { } } -impl std::ops::Index 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); @@ -202,9 +188,7 @@ impl CrateDefMap { prelude: None, root, modules, - macros: Arena::default(), public_macros: FxHashMap::default(), - macro_resolutions: FxHashMap::default(), diagnostics: Vec::new(), } };