Skip to content

Commit 5901cc7

Browse files
bors[bot]matklad
andauthored
Merge #2408
2408: Use chalk fork to paper over #2052 r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
2 parents cc1ef95 + 0a7ef09 commit 5901cc7

File tree

2 files changed

+39
-37
lines changed

2 files changed

+39
-37
lines changed

Cargo.lock

Lines changed: 34 additions & 34 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: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ hir_def = { path = "../ra_hir_def", package = "ra_hir_def" }
2626
test_utils = { path = "../test_utils" }
2727
ra_prof = { path = "../ra_prof" }
2828

29-
chalk-solve = { git = "https://github.com/rust-lang/chalk.git", rev = "a88cad7f0a69e05ba8f40b74c58a1c229c1b2478" }
30-
chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "a88cad7f0a69e05ba8f40b74c58a1c229c1b2478" }
31-
chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "a88cad7f0a69e05ba8f40b74c58a1c229c1b2478" }
29+
# https://github.com/rust-lang/chalk/pull/294
30+
chalk-solve = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" }
31+
chalk-rust-ir = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" }
32+
chalk-ir = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" }
33+
3234
lalrpop-intern = "0.15.1"
3335

3436
[dev-dependencies]

0 commit comments

Comments
 (0)