Use Solver from chalk_solve

Author: vandenheuvel

src/librustc_traits/Cargo.toml

@@ -16,7 +16,6 @@ rustc_hir = { path = "../librustc_hir" }
 rustc_index = { path = "../librustc_index" }
 rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
-chalk-integration = "0.19.0"
 chalk-ir = "0.19.0"
 chalk-solve = "0.19.0"
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }

src/librustc_traits/chalk/mod.rs

@@ -81,7 +81,7 @@ crate fn evaluate_goal<'tcx>(
         universes: max_universe + 1,
     };
 
-    let solver_choice = chalk_integration::SolverChoice::SLG {
+    let solver_choice = chalk_solve::solve::SLGSolver {
         max_size: 32,
         expected_answers: None,
     };