diff options
Diffstat (limited to 'crates/ra_hir_def')
-rw-r--r-- | crates/ra_hir_def/src/nameres.rs | 11 |
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 | ||
58 | use std::sync::Arc; | 58 | use std::sync::Arc; |
59 | 59 | ||
60 | use hir_expand::{ | 60 | use hir_expand::{diagnostics::DiagnosticSink, name::Name, InFile, MacroDefId}; |
61 | ast_id_map::FileAstId, diagnostics::DiagnosticSink, name::Name, InFile, MacroDefId, | ||
62 | }; | ||
63 | use once_cell::sync::Lazy; | 61 | use once_cell::sync::Lazy; |
64 | use ra_arena::Arena; | 62 | use ra_arena::Arena; |
65 | use ra_db::{CrateId, Edition, FileId, FilePosition}; | 63 | use 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)] | ||
180 | pub(crate) struct Declarations { | ||
181 | fns: FxHashMap<FileAstId<ast::FnDef>, FunctionId>, | ||
182 | } | ||
183 | |||
184 | #[derive(Debug, Default, PartialEq, Eq)] | 177 | #[derive(Debug, Default, PartialEq, Eq)] |
185 | pub struct ModuleScope { | 178 | pub struct ModuleScope { |
186 | items: FxHashMap<Name, Resolution>, | 179 | items: FxHashMap<Name, Resolution>, |