aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-11-26 08:46:48 +0000
committerGitHub <[email protected]>2019-11-26 08:46:48 +0000
commit5901cc736074bbc4d780a8e45079d405ab2cec4b (patch)
treed22d8ef75e656cd5d45ecd11bcfa59391c28864a /crates
parentcc1ef95d1962a0ca503b059c2275edde66d9b130 (diff)
parent0a7ef0933130b8293b09b57382fd61e3d7c46c69 (diff)
Merge #2408
2408: Use chalk fork to paper over #2052 r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_hir/Cargo.toml8
1 files changed, 5 insertions, 3 deletions
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index 42ddfecc9..f72574485 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -26,9 +26,11 @@ hir_def = { path = "../ra_hir_def", package = "ra_hir_def" }
26test_utils = { path = "../test_utils" } 26test_utils = { path = "../test_utils" }
27ra_prof = { path = "../ra_prof" } 27ra_prof = { path = "../ra_prof" }
28 28
29chalk-solve = { git = "https://github.com/rust-lang/chalk.git", rev = "a88cad7f0a69e05ba8f40b74c58a1c229c1b2478" } 29# https://github.com/rust-lang/chalk/pull/294
30chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "a88cad7f0a69e05ba8f40b74c58a1c229c1b2478" } 30chalk-solve = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" }
31chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "a88cad7f0a69e05ba8f40b74c58a1c229c1b2478" } 31chalk-rust-ir = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" }
32chalk-ir = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" }
33
32lalrpop-intern = "0.15.1" 34lalrpop-intern = "0.15.1"
33 35
34[dev-dependencies] 36[dev-dependencies]