aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir
diff options
context:
space:
mode:
authorFlorian Diebold <[email protected]>2019-09-24 17:27:31 +0100
committerFlorian Diebold <[email protected]>2019-09-24 21:29:52 +0100
commit7bb6fdcf52ea1c468c7f3f0e602be7dabd07cd36 (patch)
treee5a4eebb5ad2bd1fc0318eb8cad7f5e160e6829c /crates/ra_hir
parent4c293c0a57fbe91587f6517403c30bb61ac21dc5 (diff)
Upgrade Chalk again
Diffstat (limited to 'crates/ra_hir')
-rw-r--r--crates/ra_hir/src/ty/traits/chalk.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/crates/ra_hir/src/ty/traits/chalk.rs b/crates/ra_hir/src/ty/traits/chalk.rs
index 2e17c00e4..462156021 100644
--- a/crates/ra_hir/src/ty/traits/chalk.rs
+++ b/crates/ra_hir/src/ty/traits/chalk.rs
@@ -385,7 +385,11 @@ where
385 fn impl_datum(&self, impl_id: ImplId) -> Arc<ImplDatum> { 385 fn impl_datum(&self, impl_id: ImplId) -> Arc<ImplDatum> {
386 self.db.impl_datum(self.krate, impl_id) 386 self.db.impl_datum(self.krate, impl_id)
387 } 387 }
388 fn impls_for_trait(&self, trait_id: chalk_ir::TraitId) -> Vec<ImplId> { 388 fn impls_for_trait(
389 &self,
390 trait_id: chalk_ir::TraitId,
391 _parameters: &[Parameter],
392 ) -> Vec<ImplId> {
389 debug!("impls_for_trait {:?}", trait_id); 393 debug!("impls_for_trait {:?}", trait_id);
390 if trait_id == UNKNOWN_TRAIT { 394 if trait_id == UNKNOWN_TRAIT {
391 return Vec::new(); 395 return Vec::new();
@@ -415,8 +419,7 @@ where
415 &self, 419 &self,
416 projection: &'p chalk_ir::ProjectionTy, 420 projection: &'p chalk_ir::ProjectionTy,
417 ) -> (Arc<AssociatedTyDatum>, &'p [Parameter], &'p [Parameter]) { 421 ) -> (Arc<AssociatedTyDatum>, &'p [Parameter], &'p [Parameter]) {
418 let proj_ty: ProjectionTy = from_chalk(self.db, projection.clone()); 422 debug!("split_projection {:?}", projection);
419 debug!("split_projection {:?} = {}", projection, proj_ty.display(self.db));
420 // we don't support GATs, so I think this should always be correct currently 423 // we don't support GATs, so I think this should always be correct currently
421 (self.db.associated_ty_data(projection.associated_ty_id), &projection.parameters, &[]) 424 (self.db.associated_ty_data(projection.associated_ty_id), &projection.parameters, &[])
422 } 425 }