diff options
Diffstat (limited to 'crates/ra_analysis/src/descriptors/mod.rs')
-rw-r--r-- | crates/ra_analysis/src/descriptors/mod.rs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/crates/ra_analysis/src/descriptors/mod.rs b/crates/ra_analysis/src/descriptors/mod.rs index a8489f89c..6b56d92e1 100644 --- a/crates/ra_analysis/src/descriptors/mod.rs +++ b/crates/ra_analysis/src/descriptors/mod.rs | |||
@@ -11,7 +11,7 @@ use ra_syntax::{ | |||
11 | use crate::{ | 11 | use crate::{ |
12 | db::SyntaxDatabase, | 12 | db::SyntaxDatabase, |
13 | descriptors::function::{resolve_local_name, FnId, FnScopes}, | 13 | descriptors::function::{resolve_local_name, FnId, FnScopes}, |
14 | descriptors::module::{ModuleId, ModuleScope, ModuleTree, ModuleSource}, | 14 | descriptors::module::{ModuleId, ModuleTree, ModuleSource, nameres::{ItemMap, InputModuleItems}}, |
15 | input::SourceRootId, | 15 | input::SourceRootId, |
16 | loc2id::IdDatabase, | 16 | loc2id::IdDatabase, |
17 | syntax_ptr::LocalSyntaxPtr, | 17 | syntax_ptr::LocalSyntaxPtr, |
@@ -25,14 +25,18 @@ salsa::query_group! { | |||
25 | use fn function::imp::fn_scopes; | 25 | use fn function::imp::fn_scopes; |
26 | } | 26 | } |
27 | 27 | ||
28 | fn _input_module_items(source_root_id: SourceRootId, module_id: ModuleId) -> Cancelable<Arc<InputModuleItems>> { | ||
29 | type InputModuleItemsQuery; | ||
30 | use fn module::nameres::input_module_items; | ||
31 | } | ||
32 | fn _item_map(source_root_id: SourceRootId) -> Cancelable<Arc<ItemMap>> { | ||
33 | type ItemMapQuery; | ||
34 | use fn module::nameres::item_map; | ||
35 | } | ||
28 | fn _module_tree(source_root_id: SourceRootId) -> Cancelable<Arc<ModuleTree>> { | 36 | fn _module_tree(source_root_id: SourceRootId) -> Cancelable<Arc<ModuleTree>> { |
29 | type ModuleTreeQuery; | 37 | type ModuleTreeQuery; |
30 | use fn module::imp::module_tree; | 38 | use fn module::imp::module_tree; |
31 | } | 39 | } |
32 | fn _module_scope(source_root_id: SourceRootId, module_id: ModuleId) -> Cancelable<Arc<ModuleScope>> { | ||
33 | type ModuleScopeQuery; | ||
34 | use fn module::imp::module_scope; | ||
35 | } | ||
36 | fn _fn_syntax(fn_id: FnId) -> FnDefNode { | 40 | fn _fn_syntax(fn_id: FnId) -> FnDefNode { |
37 | type FnSyntaxQuery; | 41 | type FnSyntaxQuery; |
38 | // Don't retain syntax trees in memory | 42 | // Don't retain syntax trees in memory |