diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-30 23:10:48 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-30 23:10:48 +0000 |
commit | 032d15c392e8de7936c8729e03e6229313f3b054 (patch) | |
tree | 61cfa26801e456d5fdcd2619238c05bce62a1ac2 /crates/ra_analysis/src/db.rs | |
parent | 23cad90fe98dcca7f4b6905d9fd3ed52d2896c8c (diff) | |
parent | fbbee537228538f448a335bb0b2dabec2b3d443e (diff) |
Merge #171
171: Query-based module scopes r=matklad a=matklad
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 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crates/ra_analysis/src/db.rs b/crates/ra_analysis/src/db.rs index 3ca14af79..e7a5d5e2f 100644 --- a/crates/ra_analysis/src/db.rs +++ b/crates/ra_analysis/src/db.rs | |||
@@ -9,8 +9,9 @@ use salsa; | |||
9 | use crate::{ | 9 | use crate::{ |
10 | db, | 10 | db, |
11 | Cancelable, Canceled, | 11 | Cancelable, Canceled, |
12 | descriptors::module::{SubmodulesQuery, ModuleTreeQuery, ModulesDatabase}, | 12 | descriptors::module::{SubmodulesQuery, ModuleTreeQuery, ModulesDatabase, ModuleScopeQuery}, |
13 | symbol_index::SymbolIndex, | 13 | symbol_index::SymbolIndex, |
14 | syntax_ptr::{SyntaxPtrDatabase, ResolveSyntaxPtrQuery}, | ||
14 | FileId, | 15 | FileId, |
15 | }; | 16 | }; |
16 | 17 | ||
@@ -65,6 +66,10 @@ salsa::database_storage! { | |||
65 | impl ModulesDatabase { | 66 | impl ModulesDatabase { |
66 | fn module_tree() for ModuleTreeQuery; | 67 | fn module_tree() for ModuleTreeQuery; |
67 | fn module_descriptor() for SubmodulesQuery; | 68 | fn module_descriptor() for SubmodulesQuery; |
69 | fn module_scope() for ModuleScopeQuery; | ||
70 | } | ||
71 | impl SyntaxPtrDatabase { | ||
72 | fn resolve_syntax_ptr() for ResolveSyntaxPtrQuery; | ||
68 | } | 73 | } |
69 | } | 74 | } |
70 | } | 75 | } |