diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-26 12:42:15 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-26 12:42:15 +0000 |
commit | 36dca8de93c07be62724f973aa4c8a045941d218 (patch) | |
tree | dbe3d521c869aa12c922098e9544859343494a0e /crates/ra_hir/src/db.rs | |
parent | 280946e597f880709d2dc2e12eb9a6db3223d979 (diff) | |
parent | 4e17718a9aaba34533ba6a46d52b4aa959c662c7 (diff) |
Merge #2410
2410: Introduce hir_ty 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.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index b034d4e44..32f05a4d8 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -3,7 +3,7 @@ | |||
3 | use std::sync::Arc; | 3 | use std::sync::Arc; |
4 | 4 | ||
5 | use ra_arena::map::ArenaMap; | 5 | use ra_arena::map::ArenaMap; |
6 | use ra_db::salsa; | 6 | use ra_db::{salsa, CrateId}; |
7 | 7 | ||
8 | use crate::{ | 8 | use crate::{ |
9 | ty::{ | 9 | ty::{ |
@@ -60,7 +60,7 @@ pub trait HirDatabase: DefDatabase { | |||
60 | fn generic_defaults(&self, def: GenericDefId) -> Substs; | 60 | fn generic_defaults(&self, def: GenericDefId) -> Substs; |
61 | 61 | ||
62 | #[salsa::invoke(crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query)] | 62 | #[salsa::invoke(crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query)] |
63 | fn impls_in_crate(&self, krate: Crate) -> Arc<CrateImplBlocks>; | 63 | fn impls_in_crate(&self, krate: CrateId) -> Arc<CrateImplBlocks>; |
64 | 64 | ||
65 | #[salsa::invoke(crate::ty::traits::impls_for_trait_query)] | 65 | #[salsa::invoke(crate::ty::traits::impls_for_trait_query)] |
66 | fn impls_for_trait(&self, krate: Crate, trait_: Trait) -> Arc<[ImplBlock]>; | 66 | fn impls_for_trait(&self, krate: Crate, trait_: Trait) -> Arc<[ImplBlock]>; |