From f613c48d2e2afa1761623d186d11c1719f9ef3f7 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Mon, 20 May 2019 18:31:12 +0200 Subject: Use fuel branch for Chalk This makes sure we don't take too long in trait solving. --- crates/ra_hir/Cargo.toml | 6 +++--- crates/ra_hir/src/ty/traits.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crates') diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index cb4a8c3e3..294d047d8 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml @@ -21,9 +21,9 @@ tt = { path = "../ra_tt", package = "ra_tt" } test_utils = { path = "../test_utils" } ra_prof = { path = "../ra_prof" } -chalk-solve = { git = "https://github.com/rust-lang/chalk.git" } -chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git" } -chalk-ir = { git = "https://github.com/rust-lang/chalk.git" } +chalk-solve = { git = "https://github.com/flodiebold/chalk.git", branch = "fuel" } +chalk-rust-ir = { git = "https://github.com/flodiebold/chalk.git", branch = "fuel" } +chalk-ir = { git = "https://github.com/flodiebold/chalk.git", branch = "fuel" } [dev-dependencies] flexi_logger = "0.11.0" diff --git a/crates/ra_hir/src/ty/traits.rs b/crates/ra_hir/src/ty/traits.rs index f39749cab..e6c78c0d4 100644 --- a/crates/ra_hir/src/ty/traits.rs +++ b/crates/ra_hir/src/ty/traits.rs @@ -61,7 +61,7 @@ fn solve( let context = ChalkContext { db, krate }; let solver = db.solver(krate); debug!("solve goal: {:?}", goal); - let solution = solver.lock().unwrap().solve(&context, goal); + let solution = solver.lock().unwrap().solve_with_fuel(&context, goal, Some(1000)); debug!("solve({:?}) => {:?}", goal, solution); solution } -- cgit v1.2.3