diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-23 18:57:10 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-23 18:57:10 +0100 |
commit | ffbb60436305c9ef8c8944188e0373122051c53a (patch) | |
tree | 3240bdb3aa75eb278f13b7294f01591181189135 /crates/ra_analysis/src/db.rs | |
parent | e49c628c0d7ab30a09e8d3ba3d7ac93ab967ff6d (diff) | |
parent | dc477db757247d5184250bffe9dd0c38dd867778 (diff) |
Merge #157
157: Introduce ModuleId r=matklad a=matklad
Previously, module was synonym with a file, and so a module could have
had several parents. This commit introduces a separate module concept,
such that each module has only one parent, but a single file can
correspond to different modules.
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_analysis/src/db.rs')
-rw-r--r-- | crates/ra_analysis/src/db.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_analysis/src/db.rs b/crates/ra_analysis/src/db.rs index 956cbe162..b527cde61 100644 --- a/crates/ra_analysis/src/db.rs +++ b/crates/ra_analysis/src/db.rs | |||
@@ -12,7 +12,7 @@ use salsa; | |||
12 | use crate::{ | 12 | use crate::{ |
13 | db, | 13 | db, |
14 | Cancelable, Canceled, | 14 | Cancelable, Canceled, |
15 | module_map::{ModuleDescriptorQuery, ModuleTreeQuery, ModulesDatabase}, | 15 | descriptors::module::{SubmodulesQuery, ModuleTreeQuery, ModulesDatabase}, |
16 | symbol_index::SymbolIndex, | 16 | symbol_index::SymbolIndex, |
17 | FileId, FileResolverImp, | 17 | FileId, FileResolverImp, |
18 | }; | 18 | }; |
@@ -69,7 +69,7 @@ salsa::database_storage! { | |||
69 | } | 69 | } |
70 | impl ModulesDatabase { | 70 | impl ModulesDatabase { |
71 | fn module_tree() for ModuleTreeQuery; | 71 | fn module_tree() for ModuleTreeQuery; |
72 | fn module_descriptor() for ModuleDescriptorQuery; | 72 | fn module_descriptor() for SubmodulesQuery; |
73 | } | 73 | } |
74 | } | 74 | } |
75 | } | 75 | } |