Upgrade Chalk to published version

flodiebold · flodiebold · commit 69854f7795e2 · 2020-06-05T17:06:07.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml
@@ -27,8 +27,8 @@ test_utils = { path = "../test_utils" }
 
 scoped-tls = "1"
 
-chalk-solve =   { git = "https://github.com/rust-lang/chalk.git", rev = "329b7f3fdd2431ed6f6778cde53f22374c7d094c" }
-chalk-ir =      { git = "https://github.com/rust-lang/chalk.git", rev = "329b7f3fdd2431ed6f6778cde53f22374c7d094c" }
+chalk-solve = "0.11"
+chalk-ir = "0.11"
 
 [dev-dependencies]
 insta = "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
@@ -447,6 +447,11 @@ impl ToChalk for GenericPredicate {
                 let ty = from_chalk(db, projection_eq.ty);
                 GenericPredicate::Projection(ProjectionPredicate { projection_ty, ty })
             }
+
+            chalk_ir::WhereClause::LifetimeOutlives(_) => {
+                // we shouldn't get these from Chalk
+                panic!("encountered LifetimeOutlives from Chalk")
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -447,6 +447,11 @@ impl ToChalk for GenericPredicate {`
`447`	`447`	`let ty = from_chalk(db, projection_eq.ty);`
`448`	`448`	`GenericPredicate::Projection(ProjectionPredicate { projection_ty, ty })`
`449`	`449`	`}`
	`450`	`+`
	`451`	`+ chalk_ir::WhereClause::LifetimeOutlives(_) => {`
	`452`	`+ // we shouldn't get these from Chalk`
	`453`	`+ panic!("encountered LifetimeOutlives from Chalk")`
	`454`	`+ }`
`450`	`455`	`}`
`451`	`456`	`}`
`452`	`457`	`}`