From b9194032bcaf9bc7e0a20b079e1aa9071e4bede3 Mon Sep 17 00:00:00 2001
From: Bram van den Heuvel <bram@vandenheuvel.online>
Date: Thu, 30 Jul 2020 20:54:31 +0200
Subject: [PATCH] Use Solver from chalk_solve

---
 src/librustc_traits/Cargo.toml   | 1 -
 src/librustc_traits/chalk/mod.rs | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/librustc_traits/Cargo.toml b/src/librustc_traits/Cargo.toml
index 377be6b1a0b47..2a737736bf8f4 100644
--- a/src/librustc_traits/Cargo.toml
+++ b/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"] }
diff --git a/src/librustc_traits/chalk/mod.rs b/src/librustc_traits/chalk/mod.rs
index 3409f1500d6c7..f26219a613712 100644
--- a/src/librustc_traits/chalk/mod.rs
+++ b/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,
     };