diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-15 11:53:55 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-15 11:53:55 +0000 |
commit | 04f1bd17cbedfdc89b1061376dabd52aa94cb4a9 (patch) | |
tree | ec1b28ac2a90ebbc42d88be3a79065f71ff55db9 /crates/ra_hir_def/src/nameres.rs | |
parent | 3948de3143d06cc3056b6b8f0d18cb3e1468ae03 (diff) | |
parent | c3f84960aa99529a3afc8f28c16e657fb071db5f (diff) |
Merge #2257
2257: Flatten expr module r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/nameres.rs')
-rw-r--r-- | crates/ra_hir_def/src/nameres.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs index 5fc592150..21d5f62e0 100644 --- a/crates/ra_hir_def/src/nameres.rs +++ b/crates/ra_hir_def/src/nameres.rs | |||
@@ -58,7 +58,7 @@ mod tests; | |||
58 | 58 | ||
59 | use std::sync::Arc; | 59 | use std::sync::Arc; |
60 | 60 | ||
61 | use hir_expand::{diagnostics::DiagnosticSink, name::Name, MacroDefId}; | 61 | use hir_expand::{ast_id_map::FileAstId, diagnostics::DiagnosticSink, name::Name, MacroDefId}; |
62 | use once_cell::sync::Lazy; | 62 | use once_cell::sync::Lazy; |
63 | use ra_arena::Arena; | 63 | use ra_arena::Arena; |
64 | use ra_db::{CrateId, Edition, FileId}; | 64 | use ra_db::{CrateId, Edition, FileId}; |
@@ -73,7 +73,7 @@ use crate::{ | |||
73 | diagnostics::DefDiagnostic, path_resolution::ResolveMode, per_ns::PerNs, raw::ImportId, | 73 | diagnostics::DefDiagnostic, path_resolution::ResolveMode, per_ns::PerNs, raw::ImportId, |
74 | }, | 74 | }, |
75 | path::Path, | 75 | path::Path, |
76 | AstId, CrateModuleId, ModuleDefId, ModuleId, TraitId, | 76 | AstId, CrateModuleId, FunctionId, ModuleDefId, ModuleId, TraitId, |
77 | }; | 77 | }; |
78 | 78 | ||
79 | /// Contains all top-level defs from a macro-expanded crate | 79 | /// Contains all top-level defs from a macro-expanded crate |
@@ -124,6 +124,11 @@ pub struct ModuleData { | |||
124 | pub definition: Option<FileId>, | 124 | pub definition: Option<FileId>, |
125 | } | 125 | } |
126 | 126 | ||
127 | #[derive(Default, Debug, PartialEq, Eq, Clone)] | ||
128 | pub(crate) struct Declarations { | ||
129 | fns: FxHashMap<FileAstId<ast::FnDef>, FunctionId>, | ||
130 | } | ||
131 | |||
127 | #[derive(Debug, Default, PartialEq, Eq, Clone)] | 132 | #[derive(Debug, Default, PartialEq, Eq, Clone)] |
128 | pub struct ModuleScope { | 133 | pub struct ModuleScope { |
129 | pub items: FxHashMap<Name, Resolution>, | 134 | pub items: FxHashMap<Name, Resolution>, |