diff options
Diffstat (limited to 'crates/ra_hir/src/nameres/raw.rs')
-rw-r--r-- | crates/ra_hir/src/nameres/raw.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/crates/ra_hir/src/nameres/raw.rs b/crates/ra_hir/src/nameres/raw.rs index 3226bbf0d..f8ba398ec 100644 --- a/crates/ra_hir/src/nameres/raw.rs +++ b/crates/ra_hir/src/nameres/raw.rs | |||
@@ -12,7 +12,7 @@ use ra_syntax::{ | |||
12 | }; | 12 | }; |
13 | 13 | ||
14 | use crate::{ | 14 | use crate::{ |
15 | PersistentHirDatabase, Name, AsName, Path, HirFileId, ModuleSource, | 15 | DefDatabase, Name, AsName, Path, HirFileId, ModuleSource, |
16 | ids::{SourceFileItemId, SourceFileItems}, | 16 | ids::{SourceFileItemId, SourceFileItems}, |
17 | }; | 17 | }; |
18 | 18 | ||
@@ -47,15 +47,12 @@ impl ImportSourceMap { | |||
47 | } | 47 | } |
48 | 48 | ||
49 | impl RawItems { | 49 | impl RawItems { |
50 | pub(crate) fn raw_items_query( | 50 | pub(crate) fn raw_items_query(db: &impl DefDatabase, file_id: FileId) -> Arc<RawItems> { |
51 | db: &impl PersistentHirDatabase, | ||
52 | file_id: FileId, | ||
53 | ) -> Arc<RawItems> { | ||
54 | db.raw_items_with_source_map(file_id).0 | 51 | db.raw_items_with_source_map(file_id).0 |
55 | } | 52 | } |
56 | 53 | ||
57 | pub(crate) fn raw_items_with_source_map_query( | 54 | pub(crate) fn raw_items_with_source_map_query( |
58 | db: &impl PersistentHirDatabase, | 55 | db: &impl DefDatabase, |
59 | file_id: FileId, | 56 | file_id: FileId, |
60 | ) -> (Arc<RawItems>, Arc<ImportSourceMap>) { | 57 | ) -> (Arc<RawItems>, Arc<ImportSourceMap>) { |
61 | let mut collector = RawItemsCollector { | 58 | let mut collector = RawItemsCollector { |