diff options
author | Florian Diebold <[email protected]> | 2019-11-16 12:21:51 +0000 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2019-11-16 12:25:54 +0000 |
commit | ee190388ab9068167f665bec39edd4546336ee3d (patch) | |
tree | 4d269ae6c82662854f254e8446ae8835da78c334 /crates/ra_hir/src/db.rs | |
parent | 351c29d859d74f7a61e654bdbcad634bfb136225 (diff) |
Upgrade Chalk again
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index d9fad0ae2..d75d71d66 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -125,31 +125,38 @@ pub trait HirDatabase: DefDatabase + AstDatabase { | |||
125 | fn intern_assoc_ty_value(&self, assoc_ty_value: AssocTyValue) -> ids::AssocTyValueId; | 125 | fn intern_assoc_ty_value(&self, assoc_ty_value: AssocTyValue) -> ids::AssocTyValueId; |
126 | 126 | ||
127 | #[salsa::invoke(crate::ty::traits::chalk::associated_ty_data_query)] | 127 | #[salsa::invoke(crate::ty::traits::chalk::associated_ty_data_query)] |
128 | fn associated_ty_data(&self, id: chalk_ir::TypeId) -> Arc<chalk_rust_ir::AssociatedTyDatum>; | 128 | fn associated_ty_data( |
129 | &self, | ||
130 | id: chalk_ir::TypeId, | ||
131 | ) -> Arc<chalk_rust_ir::AssociatedTyDatum<chalk_ir::family::ChalkIr>>; | ||
129 | 132 | ||
130 | #[salsa::invoke(crate::ty::traits::chalk::trait_datum_query)] | 133 | #[salsa::invoke(crate::ty::traits::chalk::trait_datum_query)] |
131 | fn trait_datum( | 134 | fn trait_datum( |
132 | &self, | 135 | &self, |
133 | krate: Crate, | 136 | krate: Crate, |
134 | trait_id: chalk_ir::TraitId, | 137 | trait_id: chalk_ir::TraitId, |
135 | ) -> Arc<chalk_rust_ir::TraitDatum>; | 138 | ) -> Arc<chalk_rust_ir::TraitDatum<chalk_ir::family::ChalkIr>>; |
136 | 139 | ||
137 | #[salsa::invoke(crate::ty::traits::chalk::struct_datum_query)] | 140 | #[salsa::invoke(crate::ty::traits::chalk::struct_datum_query)] |
138 | fn struct_datum( | 141 | fn struct_datum( |
139 | &self, | 142 | &self, |
140 | krate: Crate, | 143 | krate: Crate, |
141 | struct_id: chalk_ir::StructId, | 144 | struct_id: chalk_ir::StructId, |
142 | ) -> Arc<chalk_rust_ir::StructDatum>; | 145 | ) -> Arc<chalk_rust_ir::StructDatum<chalk_ir::family::ChalkIr>>; |
143 | 146 | ||
144 | #[salsa::invoke(crate::ty::traits::chalk::impl_datum_query)] | 147 | #[salsa::invoke(crate::ty::traits::chalk::impl_datum_query)] |
145 | fn impl_datum(&self, krate: Crate, impl_id: chalk_ir::ImplId) -> Arc<chalk_rust_ir::ImplDatum>; | 148 | fn impl_datum( |
149 | &self, | ||
150 | krate: Crate, | ||
151 | impl_id: chalk_ir::ImplId, | ||
152 | ) -> Arc<chalk_rust_ir::ImplDatum<chalk_ir::family::ChalkIr>>; | ||
146 | 153 | ||
147 | #[salsa::invoke(crate::ty::traits::chalk::associated_ty_value_query)] | 154 | #[salsa::invoke(crate::ty::traits::chalk::associated_ty_value_query)] |
148 | fn associated_ty_value( | 155 | fn associated_ty_value( |
149 | &self, | 156 | &self, |
150 | krate: Crate, | 157 | krate: Crate, |
151 | id: chalk_rust_ir::AssociatedTyValueId, | 158 | id: chalk_rust_ir::AssociatedTyValueId, |
152 | ) -> Arc<chalk_rust_ir::AssociatedTyValue>; | 159 | ) -> Arc<chalk_rust_ir::AssociatedTyValue<chalk_ir::family::ChalkIr>>; |
153 | 160 | ||
154 | #[salsa::invoke(crate::ty::traits::trait_solve_query)] | 161 | #[salsa::invoke(crate::ty::traits::trait_solve_query)] |
155 | fn trait_solve( | 162 | fn trait_solve( |