Skip to content

Commit f9bd487

Browse files
committed
Auto merge of #13728 - detrumi:chalk-update, r=lnicola
Update to Chalk 88 This Chalk release introduces fuel for the recursive solver ([chalk#774](rust-lang/chalk#774)). I'm not sure how often it calls `should_continue` compared to the other solver, so we might want to increase `CHALK_SOLVER_FUEL`, the current default value of 100 might be too low. This should fix a lot of hangs and crashes, for example this solves the hang in #12897.
2 parents a2beeb8 + a75bffc commit f9bd487

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

Cargo.lock

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/hir-ty/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ ena = "0.14.0"
1818
tracing = "0.1.35"
1919
rustc-hash = "1.1.0"
2020
scoped-tls = "1.0.0"
21-
chalk-solve = { version = "0.87.0", default-features = false }
22-
chalk-ir = "0.87.0"
23-
chalk-recursive = { version = "0.87.0", default-features = false }
24-
chalk-derive = "0.87.0"
21+
chalk-solve = { version = "0.88.0", default-features = false }
22+
chalk-ir = "0.88.0"
23+
chalk-recursive = { version = "0.88.0", default-features = false }
24+
chalk-derive = "0.88.0"
2525
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
2626
once_cell = "1.15.0"
2727
typed-arena = "2.0.1"

crates/hir-ty/src/traits.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use crate::{
1818
};
1919

2020
/// This controls how much 'time' we give the Chalk solver before giving up.
21-
const CHALK_SOLVER_FUEL: i32 = 100;
21+
const CHALK_SOLVER_FUEL: i32 = 1000;
2222

2323
#[derive(Debug, Copy, Clone)]
2424
pub(crate) struct ChalkContext<'a> {

0 commit comments

Comments
 (0)