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/loc2id.rs | |
parent | 8086107b6ac8555a226ceb294e2c633dfe36c6e1 (diff) |
add DefId
Diffstat (limited to 'crates/ra_analysis/src/loc2id.rs')
-rw-r--r-- | crates/ra_analysis/src/loc2id.rs | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/crates/ra_analysis/src/loc2id.rs b/crates/ra_analysis/src/loc2id.rs index 8c297156a..87417df94 100644 --- a/crates/ra_analysis/src/loc2id.rs +++ b/crates/ra_analysis/src/loc2id.rs | |||
@@ -8,7 +8,9 @@ use std::{ | |||
8 | use rustc_hash::FxHashMap; | 8 | use rustc_hash::FxHashMap; |
9 | 9 | ||
10 | use crate::{ | 10 | use crate::{ |
11 | descriptors::module::ModuleId, | ||
11 | syntax_ptr::SyntaxPtr, | 12 | syntax_ptr::SyntaxPtr, |
13 | input::SourceRootId, | ||
12 | }; | 14 | }; |
13 | 15 | ||
14 | /// There are two principle ways to refer to things: | 16 | /// There are two principle ways to refer to things: |
@@ -89,6 +91,21 @@ macro_rules! impl_numeric_id { | |||
89 | pub(crate) struct FnId(u32); | 91 | pub(crate) struct FnId(u32); |
90 | impl_numeric_id!(FnId); | 92 | impl_numeric_id!(FnId); |
91 | 93 | ||
94 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | ||
95 | pub(crate) struct DefId(u32); | ||
96 | impl_numeric_id!(DefId); | ||
97 | |||
98 | #[derive(Clone, Debug, PartialEq, Eq, Hash)] | ||
99 | enum DefLoc { | ||
100 | Module { | ||
101 | id: ModuleId, | ||
102 | source_root: SourceRootId, | ||
103 | }, | ||
104 | Item { | ||
105 | ptr: SyntaxPtr, | ||
106 | } | ||
107 | } | ||
108 | |||
92 | pub(crate) trait IdDatabase: salsa::Database { | 109 | pub(crate) trait IdDatabase: salsa::Database { |
93 | fn id_maps(&self) -> &IdMaps; | 110 | fn id_maps(&self) -> &IdMaps; |
94 | } | 111 | } |
@@ -110,4 +127,5 @@ impl IdMaps { | |||
110 | #[derive(Debug, Default)] | 127 | #[derive(Debug, Default)] |
111 | struct IdMapsInner { | 128 | struct IdMapsInner { |
112 | fns: Mutex<Loc2IdMap<SyntaxPtr, FnId>>, | 129 | fns: Mutex<Loc2IdMap<SyntaxPtr, FnId>>, |
130 | defs: Mutex<Loc2IdMap<DefLoc, DefId>>, | ||
113 | } | 131 | } |