Merge #9805

9805: internal: Upgrade Chalk r=flodiebold a=flodiebold



Co-authored-by: Florian Diebold <flodiebold@gmail.com>

Author: bors[bot]

Cargo.lock

@@ -17,9 +17,9 @@ ena = "0.14.0"
 log = "0.4.8"
 rustc-hash = "1.1.0"
 scoped-tls = "1"
-chalk-solve = { version = "0.69", default-features = false }
-chalk-ir = "0.69"
-chalk-recursive = { version = "0.69", default-features = false }
+chalk-solve = { version = "0.70", default-features = false }
+chalk-ir = "0.70"
+chalk-recursive = { version = "0.70", default-features = false }
 la-arena = { version = "0.2.0", path = "../../lib/arena" }
 once_cell = { version = "1.5.0" }
 

crates/hir_ty/Cargo.toml

@@ -3,6 +3,7 @@
 use std::env::var;
 
 use chalk_ir::GoalData;
+use chalk_recursive::Cache;
 use chalk_solve::{logging_db::LoggingRustIrDatabase, Solver};
 
 use base_db::CrateId;
@@ -26,9 +27,8 @@ pub(crate) struct ChalkContext<'a> {
 fn create_chalk_solver() -> chalk_recursive::RecursiveSolver<Interner> {
     let overflow_depth =
         var("CHALK_OVERFLOW_DEPTH").ok().and_then(|s| s.parse().ok()).unwrap_or(100);
-    let caching_enabled = true;
     let max_size = var("CHALK_SOLVER_MAX_SIZE").ok().and_then(|s| s.parse().ok()).unwrap_or(30);
-    chalk_recursive::RecursiveSolver::new(overflow_depth, max_size, caching_enabled)
+    chalk_recursive::RecursiveSolver::new(overflow_depth, max_size, Some(Cache::new()))
 }
 
 /// A set of clauses that we assume to be true. E.g. if we are inside this function: