aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_hir_ty/Cargo.toml4
-rw-r--r--crates/ra_hir_ty/src/traits/chalk/mapping.rs5
2 files changed, 7 insertions, 2 deletions
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml
index 4b8dcdc07..112fcd07e 100644
--- a/crates/ra_hir_ty/Cargo.toml
+++ b/crates/ra_hir_ty/Cargo.toml
@@ -27,8 +27,8 @@ test_utils = { path = "../test_utils" }
27 27
28scoped-tls = "1" 28scoped-tls = "1"
29 29
30chalk-solve = { git = "https://github.com/rust-lang/chalk.git", rev = "329b7f3fdd2431ed6f6778cde53f22374c7d094c" } 30chalk-solve = "0.11"
31chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "329b7f3fdd2431ed6f6778cde53f22374c7d094c" } 31chalk-ir = "0.11"
32 32
33[dev-dependencies] 33[dev-dependencies]
34insta = "0.16.0" 34insta = "0.16.0"
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}