diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-05 17:05:06 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-06-05 17:05:06 +0100 |
commit | 02f7b5d7abbab829c2a0f66cdcbb6678afb412a4 (patch) | |
tree | 24528ebf2537937803c58bf0b382161de8362d3a /crates/ra_hir_ty/src/traits/chalk | |
parent | 2a3ab7f3b4b6f1917a55025d54ac39b0a0642b6e (diff) | |
parent | 69854f7795e2a5f961f4e35c13a655f0d41cc306 (diff) |
Merge #4761
4761: Upgrade Chalk to published version r=matklad a=flodiebold
CC @pksunkara
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty/src/traits/chalk')
-rw-r--r-- | crates/ra_hir_ty/src/traits/chalk/mapping.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crates/ra_hir_ty/src/traits/chalk/mapping.rs b/crates/ra_hir_ty/src/traits/chalk/mapping.rs index 834360430..28a5fbe3e 100644 --- a/crates/ra_hir_ty/src/traits/chalk/mapping.rs +++ b/crates/ra_hir_ty/src/traits/chalk/mapping.rs | |||
@@ -482,6 +482,11 @@ impl ToChalk for GenericPredicate { | |||
482 | let ty = from_chalk(db, projection_eq.ty); | 482 | let ty = from_chalk(db, projection_eq.ty); |
483 | GenericPredicate::Projection(ProjectionPredicate { projection_ty, ty }) | 483 | GenericPredicate::Projection(ProjectionPredicate { projection_ty, ty }) |
484 | } | 484 | } |
485 | |||
486 | chalk_ir::WhereClause::LifetimeOutlives(_) => { | ||
487 | // we shouldn't get these from Chalk | ||
488 | panic!("encountered LifetimeOutlives from Chalk") | ||
489 | } | ||
485 | } | 490 | } |
486 | } | 491 | } |
487 | } | 492 | } |