diff options
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 143919cdc..6eb916149 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, FileId}; | 4 | use ra_db::{SourceDatabase, salsa}; |
5 | 5 | ||
6 | use crate::{ | 6 | use crate::{ |
7 | HirFileId, SourceFileItems, SourceItemId, Crate, Module, HirInterner, | 7 | HirFileId, SourceFileItems, SourceItemId, Crate, Module, HirInterner, |
@@ -38,10 +38,13 @@ pub trait DefDatabase: SourceDatabase + AsRef<HirInterner> { | |||
38 | fn file_item(&self, source_item_id: SourceItemId) -> TreeArc<SyntaxNode>; | 38 | fn file_item(&self, source_item_id: SourceItemId) -> TreeArc<SyntaxNode>; |
39 | 39 | ||
40 | #[salsa::invoke(RawItems::raw_items_query)] | 40 | #[salsa::invoke(RawItems::raw_items_query)] |
41 | fn raw_items(&self, file_id: FileId) -> Arc<RawItems>; | 41 | fn raw_items(&self, file_id: HirFileId) -> Arc<RawItems>; |
42 | 42 | ||
43 | #[salsa::invoke(RawItems::raw_items_with_source_map_query)] | 43 | #[salsa::invoke(RawItems::raw_items_with_source_map_query)] |
44 | fn raw_items_with_source_map(&self, file_id: FileId) -> (Arc<RawItems>, Arc<ImportSourceMap>); | 44 | fn raw_items_with_source_map( |
45 | &self, | ||
46 | file_id: HirFileId, | ||
47 | ) -> (Arc<RawItems>, Arc<ImportSourceMap>); | ||
45 | 48 | ||
46 | #[salsa::invoke(CrateDefMap::crate_def_map_query)] | 49 | #[salsa::invoke(CrateDefMap::crate_def_map_query)] |
47 | fn crate_def_map(&self, krate: Crate) -> Arc<CrateDefMap>; | 50 | fn crate_def_map(&self, krate: Crate) -> Arc<CrateDefMap>; |