diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-20 17:39:00 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-20 17:39:00 +0000 |
commit | 7a5fd1f3f3c4a8f64407f9bd08a3d5e7f79417e0 (patch) | |
tree | 5a16aa6fbc213909a5d7be3c852fa2a6b9c62299 /crates/ra_hir_def/src/db.rs | |
parent | c51dcb1c4bdd71f9f17de508bd0d47e3c06ae1d5 (diff) | |
parent | cb642fc578100c0945088accb85acb8f03d2e1fd (diff) |
Merge #2328
2328: Move generic_params query to HIR 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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crates/ra_hir_def/src/db.rs b/crates/ra_hir_def/src/db.rs index c6cd4369b..844f8bbe8 100644 --- a/crates/ra_hir_def/src/db.rs +++ b/crates/ra_hir_def/src/db.rs | |||
@@ -8,13 +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 | generics::GenericParams, | ||
11 | impls::ImplData, | 12 | impls::ImplData, |
12 | nameres::{ | 13 | nameres::{ |
13 | raw::{ImportSourceMap, RawItems}, | 14 | raw::{ImportSourceMap, RawItems}, |
14 | CrateDefMap, | 15 | CrateDefMap, |
15 | }, | 16 | }, |
16 | traits::TraitData, | 17 | traits::TraitData, |
17 | DefWithBodyId, EnumId, ImplId, ItemLoc, StructOrUnionId, TraitId, | 18 | DefWithBodyId, EnumId, GenericDefId, ImplId, ItemLoc, StructOrUnionId, TraitId, |
18 | }; | 19 | }; |
19 | 20 | ||
20 | #[salsa::query_group(InternDatabaseStorage)] | 21 | #[salsa::query_group(InternDatabaseStorage)] |
@@ -71,4 +72,7 @@ pub trait DefDatabase2: InternDatabase + AstDatabase { | |||
71 | 72 | ||
72 | #[salsa::invoke(ExprScopes::expr_scopes_query)] | 73 | #[salsa::invoke(ExprScopes::expr_scopes_query)] |
73 | fn expr_scopes(&self, def: DefWithBodyId) -> Arc<ExprScopes>; | 74 | fn expr_scopes(&self, def: DefWithBodyId) -> Arc<ExprScopes>; |
75 | |||
76 | #[salsa::invoke(GenericParams::generic_params_query)] | ||
77 | fn generic_params(&self, def: GenericDefId) -> Arc<GenericParams>; | ||
74 | } | 78 | } |