diff options
Diffstat (limited to 'crates/ra_hir/src/db.rs')
| -rw-r--r-- | crates/ra_hir/src/db.rs | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 9ac811232..c60029c01 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
| @@ -8,7 +8,6 @@ use ra_syntax::SmolStr; | |||
| 8 | 8 | ||
| 9 | use crate::{ | 9 | use crate::{ |
| 10 | debug::HirDebugDatabase, | 10 | debug::HirDebugDatabase, |
| 11 | expr::{Body, BodySourceMap}, | ||
| 12 | generics::{GenericDef, GenericParams}, | 11 | generics::{GenericDef, GenericParams}, |
| 13 | ids, | 12 | ids, |
| 14 | impl_block::{ImplBlock, ImplSourceMap, ModuleImplBlocks}, | 13 | impl_block::{ImplBlock, ImplSourceMap, ModuleImplBlocks}, |
| @@ -19,13 +18,14 @@ use crate::{ | |||
| 19 | InferenceResult, Namespace, Substs, Ty, TypableDef, TypeCtor, | 18 | InferenceResult, Namespace, Substs, Ty, TypableDef, TypeCtor, |
| 20 | }, | 19 | }, |
| 21 | type_alias::TypeAliasData, | 20 | type_alias::TypeAliasData, |
| 22 | Const, ConstData, Crate, DefWithBody, ExprScopes, FnData, Function, Module, Static, | 21 | Const, ConstData, Crate, DefWithBody, FnData, Function, Module, Static, StructField, Trait, |
| 23 | StructField, Trait, TypeAlias, | 22 | TypeAlias, |
| 24 | }; | 23 | }; |
| 25 | 24 | ||
| 26 | pub use hir_def::db::{ | 25 | pub use hir_def::db::{ |
| 27 | CrateDefMapQuery, DefDatabase2, DefDatabase2Storage, EnumDataQuery, InternDatabase, | 26 | BodyQuery, BodyWithSourceMapQuery, CrateDefMapQuery, DefDatabase2, DefDatabase2Storage, |
| 28 | InternDatabaseStorage, RawItemsQuery, RawItemsWithSourceMapQuery, StructDataQuery, | 27 | EnumDataQuery, ExprScopesQuery, InternDatabase, InternDatabaseStorage, RawItemsQuery, |
| 28 | RawItemsWithSourceMapQuery, StructDataQuery, | ||
| 29 | }; | 29 | }; |
| 30 | pub use hir_expand::db::{ | 30 | pub use hir_expand::db::{ |
| 31 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, | 31 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, |
| @@ -85,9 +85,6 @@ pub trait DefDatabase: HirDebugDatabase + DefDatabase2 { | |||
| 85 | #[salsa::query_group(HirDatabaseStorage)] | 85 | #[salsa::query_group(HirDatabaseStorage)] |
| 86 | #[salsa::requires(salsa::Database)] | 86 | #[salsa::requires(salsa::Database)] |
| 87 | pub trait HirDatabase: DefDatabase + AstDatabase { | 87 | pub trait HirDatabase: DefDatabase + AstDatabase { |
| 88 | #[salsa::invoke(ExprScopes::expr_scopes_query)] | ||
| 89 | fn expr_scopes(&self, def: DefWithBody) -> Arc<ExprScopes>; | ||
| 90 | |||
| 91 | #[salsa::invoke(crate::ty::infer_query)] | 88 | #[salsa::invoke(crate::ty::infer_query)] |
| 92 | fn infer(&self, def: DefWithBody) -> Arc<InferenceResult>; | 89 | fn infer(&self, def: DefWithBody) -> Arc<InferenceResult>; |
| 93 | 90 | ||
| @@ -113,12 +110,6 @@ pub trait HirDatabase: DefDatabase + AstDatabase { | |||
| 113 | #[salsa::invoke(crate::ty::generic_defaults_query)] | 110 | #[salsa::invoke(crate::ty::generic_defaults_query)] |
| 114 | fn generic_defaults(&self, def: GenericDef) -> Substs; | 111 | fn generic_defaults(&self, def: GenericDef) -> Substs; |
| 115 | 112 | ||
| 116 | #[salsa::invoke(crate::expr::body_with_source_map_query)] | ||
| 117 | fn body_with_source_map(&self, def: DefWithBody) -> (Arc<Body>, Arc<BodySourceMap>); | ||
| 118 | |||
| 119 | #[salsa::invoke(crate::expr::body_query)] | ||
| 120 | fn body(&self, def: DefWithBody) -> Arc<Body>; | ||
| 121 | |||
| 122 | #[salsa::invoke(crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query)] | 113 | #[salsa::invoke(crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query)] |
| 123 | fn impls_in_crate(&self, krate: Crate) -> Arc<CrateImplBlocks>; | 114 | fn impls_in_crate(&self, krate: Crate) -> Arc<CrateImplBlocks>; |
| 124 | 115 | ||