diff options
author | Aleksey Kladov <[email protected]> | 2018-11-20 18:12:15 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-11-20 18:12:15 +0000 |
commit | c54b51fdedd21b0367af7cb3fac3bc16d21b8cc1 (patch) | |
tree | c94c79064646c5c757a387fcafcb87e8360673e8 /crates/ra_analysis/src/descriptors | |
parent | 8086107b6ac8555a226ceb294e2c633dfe36c6e1 (diff) |
add DefId
Diffstat (limited to 'crates/ra_analysis/src/descriptors')
-rw-r--r-- | crates/ra_analysis/src/descriptors/module/nameres.rs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/crates/ra_analysis/src/descriptors/module/nameres.rs b/crates/ra_analysis/src/descriptors/module/nameres.rs index b65b6adb7..8002656d6 100644 --- a/crates/ra_analysis/src/descriptors/module/nameres.rs +++ b/crates/ra_analysis/src/descriptors/module/nameres.rs | |||
@@ -7,6 +7,7 @@ use ra_syntax::{ | |||
7 | }; | 7 | }; |
8 | 8 | ||
9 | use crate::{ | 9 | use crate::{ |
10 | loc2id::DefId, | ||
10 | descriptors::module::ModuleId, | 11 | descriptors::module::ModuleId, |
11 | syntax_ptr::LocalSyntaxPtr, | 12 | syntax_ptr::LocalSyntaxPtr, |
12 | }; | 13 | }; |
@@ -45,7 +46,8 @@ struct ItemMap { | |||
45 | 46 | ||
46 | #[derive(Debug)] | 47 | #[derive(Debug)] |
47 | struct ModuleItems { | 48 | struct ModuleItems { |
48 | items: FxHashMap<SmolStr, PerNs<ModuleItem>>, | 49 | items: FxHashMap<SmolStr, PerNs<DefId>>, |
50 | import_resolutions: FxHashMap<LocalSyntaxPtr, DefId>, | ||
49 | } | 51 | } |
50 | 52 | ||
51 | #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] | 53 | #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] |
@@ -197,3 +199,14 @@ impl ModuleItem { | |||
197 | Some(res) | 199 | Some(res) |
198 | } | 200 | } |
199 | } | 201 | } |
202 | |||
203 | struct Resolver { | ||
204 | input: FxHashMap<ModuleId, InputModuleItems>, | ||
205 | result: ModuleItems, | ||
206 | } | ||
207 | |||
208 | impl Resolver { | ||
209 | fn resolve(&mut self){ | ||
210 | |||
211 | } | ||
212 | } | ||