Upgrade Chalk

Author: flodiebold

Cargo.lock

@@ -21,9 +21,9 @@ ra_prof = { path = "../ra_prof" }
 ra_syntax = { path = "../ra_syntax" }
 test_utils = { path = "../test_utils" }
 
-chalk-solve =   { git = "https://github.com/rust-lang/chalk.git", rev = "ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5" }
-chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5" }
-chalk-ir =      { git = "https://github.com/rust-lang/chalk.git", rev = "ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5" }
+chalk-solve =   { git = "https://github.com/rust-lang/chalk.git", rev = "af48f302a1f571b3ca418f7c5aa639a144a34f75" }
+chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "af48f302a1f571b3ca418f7c5aa639a144a34f75" }
+chalk-ir =      { git = "https://github.com/rust-lang/chalk.git", rev = "af48f302a1f571b3ca418f7c5aa639a144a34f75" }
 
 lalrpop-intern = "0.15.1"
 

crates/ra_hir_ty/Cargo.toml

@@ -50,10 +50,19 @@ impl TraitSolver {
             Err(_) => ra_db::Canceled::throw(),
         };
 
+        let fuel = std::cell::Cell::new(CHALK_SOLVER_FUEL);
+
         let solution = panic::catch_unwind({
             let solver = panic::AssertUnwindSafe(&mut solver);
             let context = panic::AssertUnwindSafe(&context);
-            move || solver.0.solve(context.0, goal)
+            move || {
+                solver.0.solve_limited(context.0, goal, || {
+                    context.0.db.check_canceled();
+                    let remaining = fuel.get();
+                    fuel.set(remaining - 1);
+                    remaining > 0
+                })
+            }
         });
 
         let solution = match solution {
@@ -79,6 +88,9 @@ impl TraitSolver {
 /// high, we can run into slow edge cases; if we set it too low, Chalk won't
 /// find some solutions.
 const CHALK_SOLVER_MAX_SIZE: usize = 4;
+/// This controls how much 'time' we give the Chalk solver before giving up.
+const CHALK_SOLVER_FUEL: i32 = 100;
+// TODO: tune both these values
 
 #[derive(Debug, Copy, Clone)]
 struct ChalkContext<'a, DB> {
@@ -97,7 +109,8 @@ pub(crate) fn trait_solver_query(
 }
 
 fn create_chalk_solver() -> chalk_solve::Solver<TypeFamily> {
-    let solver_choice = chalk_solve::SolverChoice::SLG { max_size: CHALK_SOLVER_MAX_SIZE };
+    let solver_choice =
+        chalk_solve::SolverChoice::SLG { max_size: CHALK_SOLVER_MAX_SIZE, expected_answers: None };
     solver_choice.into_solver()
 }
 
@@ -232,7 +245,6 @@ fn solution_from_chalk(
     let convert_subst = |subst: chalk_ir::Canonical<chalk_ir::Substitution<TypeFamily>>| {
         let value = subst
             .value
-            .parameters
             .into_iter()
             .map(|p| {
                 let ty = match p.ty() {