From 6e5562224ef1d67d51d529b76cf89ed14ed81ecb Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 26 Mar 2019 16:47:52 +0300
Subject: [PATCH] remove some dead code
---
crates/ra_hir/src/nameres.rs | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index 36ef615a3ae..e962bbd3118 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<Name, ModuleDef>,
root: CrateModuleId,
modules: Arena<CrateModuleId, ModuleData>,
- macros: Arena<CrateMacroId, mbe::MacroRules>,
public_macros: FxHashMap<Name, MacroDefId>,
- macro_resolutions: FxHashMap<MacroCallId, (Crate, CrateMacroId)>,
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);
@@ -202,9 +188,7 @@ impl CrateDefMap {
prelude: None,
root,
modules,
- macros: Arena::default(),
public_macros: FxHashMap::default(),
- macro_resolutions: FxHashMap::default(),
diagnostics: Vec::new(),
}
};