aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-12-20 14:28:41 +0000
committerGitHub <[email protected]>2019-12-20 14:28:41 +0000
commit81a1b14d78d6078c63dd42c09da5a3e171c85a3a (patch)
tree58185563f5b5ce737109e7a5c220211440d7d9c5 /crates
parent890ec6f7987af9fee0675502db1d419a12f9071c (diff)
parent794bbab70dfd009178adf03bd82a30dc569ecde6 (diff)
Merge #2613
2613: Remove code that never was alive? r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_hir_def/src/nameres.rs11
1 files changed, 2 insertions, 9 deletions
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs
index 9aae7e48e..af52fa36e 100644
--- a/crates/ra_hir_def/src/nameres.rs
+++ b/crates/ra_hir_def/src/nameres.rs
@@ -57,9 +57,7 @@ mod tests;
57 57
58use std::sync::Arc; 58use std::sync::Arc;
59 59
60use hir_expand::{ 60use hir_expand::{diagnostics::DiagnosticSink, name::Name, InFile, MacroDefId};
61 ast_id_map::FileAstId, diagnostics::DiagnosticSink, name::Name, InFile, MacroDefId,
62};
63use once_cell::sync::Lazy; 61use once_cell::sync::Lazy;
64use ra_arena::Arena; 62use ra_arena::Arena;
65use ra_db::{CrateId, Edition, FileId, FilePosition}; 63use ra_db::{CrateId, Edition, FileId, FilePosition};
@@ -76,7 +74,7 @@ use crate::{
76 nameres::{diagnostics::DefDiagnostic, path_resolution::ResolveMode}, 74 nameres::{diagnostics::DefDiagnostic, path_resolution::ResolveMode},
77 path::ModPath, 75 path::ModPath,
78 per_ns::PerNs, 76 per_ns::PerNs,
79 AstId, FunctionId, ImplId, LocalImportId, LocalModuleId, ModuleDefId, ModuleId, TraitId, 77 AstId, ImplId, LocalImportId, LocalModuleId, ModuleDefId, ModuleId, TraitId,
80}; 78};
81 79
82/// Contains all top-level defs from a macro-expanded crate 80/// Contains all top-level defs from a macro-expanded crate
@@ -176,11 +174,6 @@ pub struct ModuleData {
176 pub impls: Vec<ImplId>, 174 pub impls: Vec<ImplId>,
177} 175}
178 176
179#[derive(Default, Debug, PartialEq, Eq)]
180pub(crate) struct Declarations {
181 fns: FxHashMap<FileAstId<ast::FnDef>, FunctionId>,
182}
183
184#[derive(Debug, Default, PartialEq, Eq)] 177#[derive(Debug, Default, PartialEq, Eq)]
185pub struct ModuleScope { 178pub struct ModuleScope {
186 items: FxHashMap<Name, Resolution>, 179 items: FxHashMap<Name, Resolution>,