diff options
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index c4dd54596..23c36014b 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -6,9 +6,9 @@ use ra_db::{SourceDatabase, salsa}; | |||
6 | 6 | ||
7 | use crate::{ | 7 | use crate::{ |
8 | HirFileId, MacroDefId, AstIdMap, ErasedFileAstId, Crate, Module, MacroCallLoc, | 8 | HirFileId, MacroDefId, AstIdMap, ErasedFileAstId, Crate, Module, MacroCallLoc, |
9 | Function, FnSignature, ExprScopes, TypeAlias, | 9 | Function, FnData, ExprScopes, TypeAlias, |
10 | Struct, Enum, StructField, | 10 | Struct, Enum, StructField, |
11 | Const, ConstSignature, Static, | 11 | Const, ConstData, Static, |
12 | DefWithBody, Trait, | 12 | DefWithBody, Trait, |
13 | ids, | 13 | ids, |
14 | nameres::{Namespace, ImportSourceMap, RawItems, CrateDefMap}, | 14 | nameres::{Namespace, ImportSourceMap, RawItems, CrateDefMap}, |
@@ -109,17 +109,17 @@ pub trait DefDatabase: SourceDatabase { | |||
109 | #[salsa::invoke(crate::generics::GenericParams::generic_params_query)] | 109 | #[salsa::invoke(crate::generics::GenericParams::generic_params_query)] |
110 | fn generic_params(&self, def: GenericDef) -> Arc<GenericParams>; | 110 | fn generic_params(&self, def: GenericDef) -> Arc<GenericParams>; |
111 | 111 | ||
112 | #[salsa::invoke(crate::FnSignature::fn_signature_query)] | 112 | #[salsa::invoke(crate::FnData::fn_data_query)] |
113 | fn fn_signature(&self, func: Function) -> Arc<FnSignature>; | 113 | fn fn_data(&self, func: Function) -> Arc<FnData>; |
114 | 114 | ||
115 | #[salsa::invoke(crate::type_alias::type_alias_data_query)] | 115 | #[salsa::invoke(crate::type_alias::type_alias_data_query)] |
116 | fn type_alias_data(&self, typ: TypeAlias) -> Arc<TypeAliasData>; | 116 | fn type_alias_data(&self, typ: TypeAlias) -> Arc<TypeAliasData>; |
117 | 117 | ||
118 | #[salsa::invoke(crate::ConstSignature::const_signature_query)] | 118 | #[salsa::invoke(crate::ConstData::const_data_query)] |
119 | fn const_signature(&self, konst: Const) -> Arc<ConstSignature>; | 119 | fn const_data(&self, konst: Const) -> Arc<ConstData>; |
120 | 120 | ||
121 | #[salsa::invoke(crate::ConstSignature::static_signature_query)] | 121 | #[salsa::invoke(crate::ConstData::static_data_query)] |
122 | fn static_signature(&self, konst: Static) -> Arc<ConstSignature>; | 122 | fn static_data(&self, konst: Static) -> Arc<ConstData>; |
123 | 123 | ||
124 | #[salsa::invoke(crate::lang_item::LangItems::lang_items_query)] | 124 | #[salsa::invoke(crate::lang_item::LangItems::lang_items_query)] |
125 | fn lang_items(&self, krate: Crate) -> Arc<LangItems>; | 125 | fn lang_items(&self, krate: Crate) -> Arc<LangItems>; |