language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 20:42:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge #1058

Browse source 
1058: remove some dead code r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-03-26 13:50:49 +00:00
commit 619a4c05ba
1 changed files with 1 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/ra_hir/src/nameres.rs
View file

@ -63,7 +63,7 @@ use test_utils::tested_by;
use crate::{ use crate::{
ModuleDef, Name, Crate, Module, SourceItemId, ModuleDef, Name, Crate, Module, SourceItemId,
DefDatabase, Path, PathKind, HirFileId, Trait, DefDatabase, Path, PathKind, HirFileId, Trait,
ids::{MacroCallId, MacroDefId}, ids::MacroDefId,
diagnostics::DiagnosticSink, diagnostics::DiagnosticSink,
nameres::diagnostics::DefDiagnostic, nameres::diagnostics::DefDiagnostic,
}; };
@ -84,9 +84,7 @@ pub struct CrateDefMap {
extern_prelude: FxHashMap<Name, ModuleDef>, extern_prelude: FxHashMap<Name, ModuleDef>,
root: CrateModuleId, root: CrateModuleId,
modules: Arena<CrateModuleId, ModuleData>, modules: Arena<CrateModuleId, ModuleData>,
macros: Arena<CrateMacroId, mbe::MacroRules>,
public_macros: FxHashMap<Name, MacroDefId>, public_macros: FxHashMap<Name, MacroDefId>,
macro_resolutions: FxHashMap<MacroCallId, (Crate, CrateMacroId)>,
diagnostics: Vec<DefDiagnostic>, 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 /// An ID of a module, **local** to a specific crate
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub(crate) struct CrateModuleId(RawId); pub(crate) struct CrateModuleId(RawId);
@ -202,9 +188,7 @@ impl CrateDefMap {
prelude: None, prelude: None,
root, root,
modules, modules,
macros: Arena::default(),
public_macros: FxHashMap::default(), public_macros: FxHashMap::default(),
macro_resolutions: FxHashMap::default(),
diagnostics: Vec::new(), diagnostics: Vec::new(),
} }
}; };