diff options
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 8f98ca3a5..8e827d4f5 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -1,6 +1,6 @@ | |||
1 | use std::sync::{Arc, Mutex}; | 1 | use std::sync::{Arc, Mutex}; |
2 | 2 | ||
3 | use ra_syntax::{SyntaxNode, TreeArc, SourceFile, SmolStr, ast}; | 3 | use ra_syntax::{SyntaxNode, TreeArc, SmolStr, ast}; |
4 | use ra_db::{SourceDatabase, salsa}; | 4 | use ra_db::{SourceDatabase, salsa}; |
5 | 5 | ||
6 | use crate::{ | 6 | use crate::{ |
@@ -54,8 +54,8 @@ pub trait DefDatabase: SourceDatabase { | |||
54 | #[salsa::invoke(crate::ids::macro_expand_query)] | 54 | #[salsa::invoke(crate::ids::macro_expand_query)] |
55 | fn macro_expand(&self, macro_call: ids::MacroCallId) -> Result<Arc<tt::Subtree>, String>; | 55 | fn macro_expand(&self, macro_call: ids::MacroCallId) -> Result<Arc<tt::Subtree>, String>; |
56 | 56 | ||
57 | #[salsa::invoke(crate::ids::HirFileId::hir_parse_query)] | 57 | #[salsa::invoke(crate::ids::HirFileId::parse_or_expand_query)] |
58 | fn hir_parse(&self, file_id: HirFileId) -> TreeArc<SourceFile>; | 58 | fn parse_or_expand(&self, file_id: HirFileId) -> Option<TreeArc<SyntaxNode>>; |
59 | 59 | ||
60 | #[salsa::invoke(crate::adt::StructData::struct_data_query)] | 60 | #[salsa::invoke(crate::adt::StructData::struct_data_query)] |
61 | fn struct_data(&self, s: Struct) -> Arc<StructData>; | 61 | fn struct_data(&self, s: Struct) -> Arc<StructData>; |