diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-22 14:43:32 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-11-22 14:43:32 +0000 |
| commit | b841c53a0c93cdca3f08b1c917c9fa8a63d31604 (patch) | |
| tree | 2b1d06598328b9d1922e83c791f181b5789eb789 /crates/ra_hir_def/src/db.rs | |
| parent | a132cc715ed05cab83fd058156eb152f0be96982 (diff) | |
| parent | 64df759418a83fd05fab850b8351fcddbdd3ef63 (diff) | |
Merge #2356
2356: Move FunctionData to hir_def r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/db.rs')
| -rw-r--r-- | crates/ra_hir_def/src/db.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crates/ra_hir_def/src/db.rs b/crates/ra_hir_def/src/db.rs index 5bbdaa4b2..8c1784ec9 100644 --- a/crates/ra_hir_def/src/db.rs +++ b/crates/ra_hir_def/src/db.rs | |||
| @@ -8,15 +8,14 @@ use ra_syntax::ast; | |||
| 8 | use crate::{ | 8 | use crate::{ |
| 9 | adt::{EnumData, StructData}, | 9 | adt::{EnumData, StructData}, |
| 10 | body::{scope::ExprScopes, Body, BodySourceMap}, | 10 | body::{scope::ExprScopes, Body, BodySourceMap}, |
| 11 | data::{FunctionData, ImplData, TraitData, TypeAliasData}, | ||
| 11 | generics::GenericParams, | 12 | generics::GenericParams, |
| 12 | impls::ImplData, | ||
| 13 | nameres::{ | 13 | nameres::{ |
| 14 | raw::{ImportSourceMap, RawItems}, | 14 | raw::{ImportSourceMap, RawItems}, |
| 15 | CrateDefMap, | 15 | CrateDefMap, |
| 16 | }, | 16 | }, |
| 17 | traits::TraitData, | 17 | DefWithBodyId, EnumId, FunctionId, GenericDefId, ImplId, ItemLoc, StructOrUnionId, TraitId, |
| 18 | type_alias::TypeAliasData, | 18 | TypeAliasId, |
| 19 | DefWithBodyId, EnumId, GenericDefId, ImplId, ItemLoc, StructOrUnionId, TraitId, TypeAliasId, | ||
| 20 | }; | 19 | }; |
| 21 | 20 | ||
| 22 | #[salsa::query_group(InternDatabaseStorage)] | 21 | #[salsa::query_group(InternDatabaseStorage)] |
| @@ -68,6 +67,9 @@ pub trait DefDatabase2: InternDatabase + AstDatabase { | |||
| 68 | #[salsa::invoke(TypeAliasData::type_alias_data_query)] | 67 | #[salsa::invoke(TypeAliasData::type_alias_data_query)] |
| 69 | fn type_alias_data(&self, e: TypeAliasId) -> Arc<TypeAliasData>; | 68 | fn type_alias_data(&self, e: TypeAliasId) -> Arc<TypeAliasData>; |
| 70 | 69 | ||
| 70 | #[salsa::invoke(FunctionData::fn_data_query)] | ||
| 71 | fn function_data(&self, func: FunctionId) -> Arc<FunctionData>; | ||
| 72 | |||
| 71 | #[salsa::invoke(Body::body_with_source_map_query)] | 73 | #[salsa::invoke(Body::body_with_source_map_query)] |
| 72 | fn body_with_source_map(&self, def: DefWithBodyId) -> (Arc<Body>, Arc<BodySourceMap>); | 74 | fn body_with_source_map(&self, def: DefWithBodyId) -> (Arc<Body>, Arc<BodySourceMap>); |
| 73 | 75 | ||