diff options
author | Florian Diebold <[email protected]> | 2019-01-04 18:29:53 +0000 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2019-01-04 18:29:53 +0000 |
commit | 443ddb73c395a311b4ddff3bd8267a0eb7079216 (patch) | |
tree | 416d588a0bda45399c54297482189c58ce4681ce /crates/ra_hir/src/db.rs | |
parent | 334ca0d9a790d14414301daa896848bf9a880982 (diff) |
Do impl collection per module, not per crate
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 6d5235ba4..a045bbb12 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -4,7 +4,7 @@ use ra_syntax::{SyntaxNode, SourceFileNode}; | |||
4 | use ra_db::{SourceRootId, LocationIntener, SyntaxDatabase, Cancelable}; | 4 | use ra_db::{SourceRootId, LocationIntener, SyntaxDatabase, Cancelable}; |
5 | 5 | ||
6 | use crate::{ | 6 | use crate::{ |
7 | Crate, DefLoc, DefId, MacroCallLoc, MacroCallId, Name, HirFileId, | 7 | DefLoc, DefId, MacroCallLoc, MacroCallId, Name, HirFileId, |
8 | SourceFileItems, SourceItemId, | 8 | SourceFileItems, SourceItemId, |
9 | query_definitions, | 9 | query_definitions, |
10 | FnScopes, | 10 | FnScopes, |
@@ -13,7 +13,7 @@ use crate::{ | |||
13 | nameres::{ItemMap, InputModuleItems}}, | 13 | nameres::{ItemMap, InputModuleItems}}, |
14 | ty::{InferenceResult, Ty}, | 14 | ty::{InferenceResult, Ty}, |
15 | adt::{StructData, EnumData}, | 15 | adt::{StructData, EnumData}, |
16 | impl_block::CrateImplBlocks, | 16 | impl_block::ModuleImplBlocks, |
17 | }; | 17 | }; |
18 | 18 | ||
19 | salsa::query_group! { | 19 | salsa::query_group! { |
@@ -89,9 +89,9 @@ pub trait HirDatabase: SyntaxDatabase | |||
89 | use fn crate::module::imp::module_tree; | 89 | use fn crate::module::imp::module_tree; |
90 | } | 90 | } |
91 | 91 | ||
92 | fn impls_in_crate(krate: Crate) -> Cancelable<Arc<CrateImplBlocks>> { | 92 | fn impls_in_module(source_root_id: SourceRootId, module_id: ModuleId) -> Cancelable<Arc<ModuleImplBlocks>> { |
93 | type ImplsInCrateQuery; | 93 | type ImplsInCrateQuery; |
94 | use fn crate::impl_block::impls_in_crate; | 94 | use fn crate::impl_block::impls_in_module; |
95 | } | 95 | } |
96 | } | 96 | } |
97 | 97 | ||