aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/db.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-11-25 12:39:45 +0000
committerGitHub <[email protected]>2019-11-25 12:39:45 +0000
commitc46cea2ad8239315d51952bfb1dad65c200dae7c (patch)
tree5cb05c66e7d6bfc51f206f27f561f3b54971c7b4 /crates/ra_hir/src/db.rs
parent9f7fcc6ecd5334c5e3caa365c4a6d7bf3f37b649 (diff)
parentc2a16632d0773dec707acb215297ef55b5c880fe (diff)
Merge #2399
2399: Use GenericDefId more r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r--crates/ra_hir/src/db.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index 5084bbacf..7ec04ad73 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -24,7 +24,7 @@ pub use hir_def::{
24 RawItemsWithSourceMapQuery, StaticDataQuery, StructDataQuery, TraitDataQuery, 24 RawItemsWithSourceMapQuery, StaticDataQuery, StructDataQuery, TraitDataQuery,
25 TypeAliasDataQuery, 25 TypeAliasDataQuery,
26 }, 26 },
27 LocalStructFieldId, VariantId, 27 GenericDefId, LocalStructFieldId, VariantId,
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,
@@ -54,7 +54,7 @@ pub trait HirDatabase: DefDatabase {
54 ) -> Arc<[GenericPredicate]>; 54 ) -> Arc<[GenericPredicate]>;
55 55
56 #[salsa::invoke(crate::ty::generic_predicates_query)] 56 #[salsa::invoke(crate::ty::generic_predicates_query)]
57 fn generic_predicates(&self, def: GenericDef) -> Arc<[GenericPredicate]>; 57 fn generic_predicates(&self, def: GenericDefId) -> Arc<[GenericPredicate]>;
58 58
59 #[salsa::invoke(crate::ty::generic_defaults_query)] 59 #[salsa::invoke(crate::ty::generic_defaults_query)]
60 fn generic_defaults(&self, def: GenericDef) -> Substs; 60 fn generic_defaults(&self, def: GenericDef) -> Substs;