aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/db.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-11-22 14:10:51 +0000
committerAleksey Kladov <[email protected]>2019-11-22 14:18:04 +0000
commit78f3b0627cf4a5d34aaf63c7b5a2e1b744a11b14 (patch)
tree0c0e07fefce4b4175e8162bcd586aaca17512bb8 /crates/ra_hir/src/db.rs
parenta132cc715ed05cab83fd058156eb152f0be96982 (diff)
Move FunctionData to hir_def
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r--crates/ra_hir/src/db.rs13
1 files changed, 5 insertions, 8 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index 1cfcb2fd2..8b9af0565 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -16,15 +16,15 @@ use crate::{
16 CallableDef, FnSig, GenericPredicate, InferenceResult, Namespace, Substs, Ty, TypableDef, 16 CallableDef, FnSig, GenericPredicate, InferenceResult, Namespace, Substs, Ty, TypableDef,
17 TypeCtor, 17 TypeCtor,
18 }, 18 },
19 Const, ConstData, Crate, DefWithBody, FnData, Function, GenericDef, ImplBlock, Module, Static, 19 Const, ConstData, Crate, DefWithBody, GenericDef, ImplBlock, Module, Static, StructField,
20 StructField, Trait, 20 Trait,
21}; 21};
22 22
23pub use hir_def::db::{ 23pub use hir_def::db::{
24 BodyQuery, BodyWithSourceMapQuery, CrateDefMapQuery, DefDatabase2, DefDatabase2Storage, 24 BodyQuery, BodyWithSourceMapQuery, CrateDefMapQuery, DefDatabase2, DefDatabase2Storage,
25 EnumDataQuery, ExprScopesQuery, GenericParamsQuery, ImplDataQuery, InternDatabase, 25 EnumDataQuery, ExprScopesQuery, FunctionDataQuery, GenericParamsQuery, ImplDataQuery,
26 InternDatabaseStorage, RawItemsQuery, RawItemsWithSourceMapQuery, StructDataQuery, 26 InternDatabase, InternDatabaseStorage, RawItemsQuery, RawItemsWithSourceMapQuery,
27 TraitDataQuery, TypeAliasDataQuery, 27 StructDataQuery, TraitDataQuery, TypeAliasDataQuery,
28}; 28};
29pub use hir_expand::db::{ 29pub use hir_expand::db::{
30 AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, 30 AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery,
@@ -35,9 +35,6 @@ pub use hir_expand::db::{
35#[salsa::query_group(DefDatabaseStorage)] 35#[salsa::query_group(DefDatabaseStorage)]
36#[salsa::requires(AstDatabase)] 36#[salsa::requires(AstDatabase)]
37pub trait DefDatabase: HirDebugDatabase + DefDatabase2 { 37pub trait DefDatabase: HirDebugDatabase + DefDatabase2 {
38 #[salsa::invoke(FnData::fn_data_query)]
39 fn fn_data(&self, func: Function) -> Arc<FnData>;
40
41 #[salsa::invoke(ConstData::const_data_query)] 38 #[salsa::invoke(ConstData::const_data_query)]
42 fn const_data(&self, konst: Const) -> Arc<ConstData>; 39 fn const_data(&self, konst: Const) -> Arc<ConstData>;
43 40