diff options
author | Florian Diebold <[email protected]> | 2019-07-08 20:43:52 +0100 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2019-07-08 20:47:37 +0100 |
commit | 9afbf2dff43dee3227358f10162d4c77d192ce7a (patch) | |
tree | 82d38315b9be21dec920f59389ea89cdb3ae0a41 /crates/ra_hir/src/db.rs | |
parent | 15862fc04183c7f9b3f3af666336a594a6a52cd9 (diff) |
Unify `normalize` and `implements` to simplify code
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index e0a37e13d..b0c027631 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -213,18 +213,11 @@ pub trait HirDatabase: DefDatabase + AstDatabase { | |||
213 | #[salsa::invoke(crate::ty::traits::chalk::impl_datum_query)] | 213 | #[salsa::invoke(crate::ty::traits::chalk::impl_datum_query)] |
214 | fn impl_datum(&self, krate: Crate, impl_id: chalk_ir::ImplId) -> Arc<chalk_rust_ir::ImplDatum>; | 214 | fn impl_datum(&self, krate: Crate, impl_id: chalk_ir::ImplId) -> Arc<chalk_rust_ir::ImplDatum>; |
215 | 215 | ||
216 | #[salsa::invoke(crate::ty::traits::implements_query)] | 216 | #[salsa::invoke(crate::ty::traits::solve_query)] |
217 | fn implements( | 217 | fn solve( |
218 | &self, | 218 | &self, |
219 | krate: Crate, | 219 | krate: Crate, |
220 | goal: crate::ty::Canonical<crate::ty::InEnvironment<crate::ty::TraitRef>>, | 220 | goal: crate::ty::Canonical<crate::ty::InEnvironment<crate::ty::Obligation>>, |
221 | ) -> Option<crate::ty::traits::Solution>; | ||
222 | |||
223 | #[salsa::invoke(crate::ty::traits::normalize_query)] | ||
224 | fn normalize( | ||
225 | &self, | ||
226 | krate: Crate, | ||
227 | goal: crate::ty::Canonical<crate::ty::InEnvironment<crate::ty::ProjectionPredicate>>, | ||
228 | ) -> Option<crate::ty::traits::Solution>; | 221 | ) -> Option<crate::ty::traits::Solution>; |
229 | } | 222 | } |
230 | 223 | ||