From c8284d8424691dc348af8708abfc2172b7dd5dc5 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sun, 14 Jul 2019 22:11:04 +0200 Subject: Switch to Chalk master, without fuel --- crates/ra_hir/Cargo.toml | 6 +++--- crates/ra_hir/src/ty/traits.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_hir') diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index de2c2dbec..833956ce8 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/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" } +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" } lalrpop-intern = "0.15.1" [dev-dependencies] diff --git a/crates/ra_hir/src/ty/traits.rs b/crates/ra_hir/src/ty/traits.rs index 7dccd93be..0769e6e17 100644 --- a/crates/ra_hir/src/ty/traits.rs +++ b/crates/ra_hir/src/ty/traits.rs @@ -62,7 +62,7 @@ fn solve( let context = ChalkContext { db, krate }; let solver = db.trait_solver(krate); debug!("solve goal: {:?}", goal); - let solution = solver.lock().solve_with_fuel(&context, goal, Some(1000)); + let solution = solver.lock().solve(&context, goal); debug!("solve({:?}) => {:?}", goal, solution); solution } -- cgit v1.2.3