diff options
author | Aleksey Kladov <[email protected]> | 2019-03-13 13:38:02 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-03-17 09:49:07 +0000 |
commit | 2195d1db6d70d64383bec82819fab02891d09744 (patch) | |
tree | 40174ca7cbb3625ea62ebc10dbd9b592c83a8081 /crates/ra_hir/src/db.rs | |
parent | 182c05a96c25321ac3ff262cea098e0c4d7ed6f8 (diff) |
Replace module_tree with CrateDefMap
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 5ad9547f1..423922a57 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -1,7 +1,7 @@ | |||
1 | use std::sync::Arc; | 1 | use std::sync::Arc; |
2 | 2 | ||
3 | use ra_syntax::{SyntaxNode, TreeArc, SourceFile}; | 3 | use ra_syntax::{SyntaxNode, TreeArc, SourceFile}; |
4 | use ra_db::{SourceDatabase, salsa}; | 4 | use ra_db::{SourceDatabase, salsa, FileId}; |
5 | 5 | ||
6 | use crate::{ | 6 | use crate::{ |
7 | MacroCallId, HirFileId, | 7 | MacroCallId, HirFileId, |
@@ -10,14 +10,11 @@ use crate::{ | |||
10 | Struct, Enum, StructField, | 10 | Struct, Enum, StructField, |
11 | Const, ConstSignature, Static, | 11 | Const, ConstSignature, Static, |
12 | macros::MacroExpansion, | 12 | macros::MacroExpansion, |
13 | module_tree::ModuleTree, | 13 | nameres::{Namespace, ItemMap, lower::{LoweredModule, ImportSourceMap}, crate_def_map::{RawItems, CrateDefMap}}, |
14 | nameres::{ItemMap, lower::{LoweredModule, ImportSourceMap}}, | ||
15 | ty::{InferenceResult, Ty, method_resolution::CrateImplBlocks, TypableDef, CallableDef, FnSig}, | 14 | ty::{InferenceResult, Ty, method_resolution::CrateImplBlocks, TypableDef, CallableDef, FnSig}, |
16 | adt::{StructData, EnumData}, | 15 | adt::{StructData, EnumData}, |
17 | impl_block::{ModuleImplBlocks, ImplSourceMap}, | 16 | impl_block::{ModuleImplBlocks, ImplSourceMap}, |
18 | generics::{GenericParams, GenericDef}, | 17 | generics::{GenericParams, GenericDef}, |
19 | ids::SourceFileItemId, | ||
20 | nameres::Namespace, | ||
21 | type_ref::TypeRef, | 18 | type_ref::TypeRef, |
22 | }; | 19 | }; |
23 | 20 | ||
@@ -41,13 +38,6 @@ pub trait PersistentHirDatabase: SourceDatabase + AsRef<HirInterner> { | |||
41 | #[salsa::invoke(crate::ids::SourceFileItems::file_item_query)] | 38 | #[salsa::invoke(crate::ids::SourceFileItems::file_item_query)] |
42 | fn file_item(&self, source_item_id: SourceItemId) -> TreeArc<SyntaxNode>; | 39 | fn file_item(&self, source_item_id: SourceItemId) -> TreeArc<SyntaxNode>; |
43 | 40 | ||
44 | #[salsa::invoke(crate::module_tree::Submodule::submodules_query)] | ||
45 | fn submodules( | ||
46 | &self, | ||
47 | file_id: HirFileId, | ||
48 | delc_id: Option<SourceFileItemId>, | ||
49 | ) -> Arc<Vec<crate::module_tree::Submodule>>; | ||
50 | |||
51 | #[salsa::invoke(crate::nameres::lower::LoweredModule::lower_module_with_source_map_query)] | 41 | #[salsa::invoke(crate::nameres::lower::LoweredModule::lower_module_with_source_map_query)] |
52 | fn lower_module_with_source_map( | 42 | fn lower_module_with_source_map( |
53 | &self, | 43 | &self, |
@@ -57,11 +47,14 @@ pub trait PersistentHirDatabase: SourceDatabase + AsRef<HirInterner> { | |||
57 | #[salsa::invoke(crate::nameres::lower::LoweredModule::lower_module_query)] | 47 | #[salsa::invoke(crate::nameres::lower::LoweredModule::lower_module_query)] |
58 | fn lower_module(&self, module: Module) -> Arc<LoweredModule>; | 48 | fn lower_module(&self, module: Module) -> Arc<LoweredModule>; |
59 | 49 | ||
50 | #[salsa::invoke(RawItems::raw_items_query)] | ||
51 | fn raw_items(&self, file_id: FileId) -> Arc<RawItems>; | ||
52 | |||
60 | #[salsa::invoke(crate::nameres::ItemMap::item_map_query)] | 53 | #[salsa::invoke(crate::nameres::ItemMap::item_map_query)] |
61 | fn item_map(&self, krate: Crate) -> Arc<ItemMap>; | 54 | fn item_map(&self, krate: Crate) -> Arc<ItemMap>; |
62 | 55 | ||
63 | #[salsa::invoke(crate::module_tree::ModuleTree::module_tree_query)] | 56 | #[salsa::invoke(CrateDefMap::crate_def_map_query)] |
64 | fn module_tree(&self, krate: Crate) -> Arc<ModuleTree>; | 57 | fn crate_def_map(&self, krate: Crate) -> Arc<CrateDefMap>; |
65 | 58 | ||
66 | #[salsa::invoke(crate::impl_block::impls_in_module)] | 59 | #[salsa::invoke(crate::impl_block::impls_in_module)] |
67 | fn impls_in_module(&self, module: Module) -> Arc<ModuleImplBlocks>; | 60 | fn impls_in_module(&self, module: Module) -> Arc<ModuleImplBlocks>; |