Skip to content

Commit f613c48

Browse files
committed
Use fuel branch for Chalk
This makes sure we don't take too long in trait solving.
1 parent ed943ad commit f613c48

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

Cargo.lock

Lines changed: 23 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/ra_hir/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ tt = { path = "../ra_tt", package = "ra_tt" }
2121
test_utils = { path = "../test_utils" }
2222
ra_prof = { path = "../ra_prof" }
2323

24-
chalk-solve = { git = "https://github.com/rust-lang/chalk.git" }
25-
chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git" }
26-
chalk-ir = { git = "https://github.com/rust-lang/chalk.git" }
24+
chalk-solve = { git = "https://github.com/flodiebold/chalk.git", branch = "fuel" }
25+
chalk-rust-ir = { git = "https://github.com/flodiebold/chalk.git", branch = "fuel" }
26+
chalk-ir = { git = "https://github.com/flodiebold/chalk.git", branch = "fuel" }
2727

2828
[dev-dependencies]
2929
flexi_logger = "0.11.0"

crates/ra_hir/src/ty/traits.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fn solve(
6161
let context = ChalkContext { db, krate };
6262
let solver = db.solver(krate);
6363
debug!("solve goal: {:?}", goal);
64-
let solution = solver.lock().unwrap().solve(&context, goal);
64+
let solution = solver.lock().unwrap().solve_with_fuel(&context, goal, Some(1000));
6565
debug!("solve({:?}) => {:?}", goal, solution);
6666
solution
6767
}

0 commit comments

Comments
 (0)