diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-09 20:40:05 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-09 20:40:05 +0000 |
commit | baae1b3d0049e804e76d39cde82ebec0ef0599bb (patch) | |
tree | d0bda6f7fd7916a6c8c7846c1263b11f38f8d858 /crates | |
parent | e292573f425eece6f1666e051d7fe64b79640d39 (diff) | |
parent | 16df4d8fcbf6695d8b033efe2dcaa5167629d9c8 (diff) |
Merge #2516
2516: chore: bump deps and use mainline chalk r=matklad a=lnicola
Co-authored-by: Laurențiu Nicola <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_hir_ty/Cargo.toml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml index 429242870..d277bf2bc 100644 --- a/crates/ra_hir_ty/Cargo.toml +++ b/crates/ra_hir_ty/Cargo.toml | |||
@@ -22,9 +22,9 @@ ra_syntax = { path = "../ra_syntax" } | |||
22 | test_utils = { path = "../test_utils" } | 22 | test_utils = { path = "../test_utils" } |
23 | 23 | ||
24 | # https://github.com/rust-lang/chalk/pull/294 | 24 | # https://github.com/rust-lang/chalk/pull/294 |
25 | chalk-solve = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" } | 25 | chalk-solve = { git = "https://github.com/rust-lang/chalk.git", rev = "151949dece8117d180b5d197a7afa968c3ba14bb" } |
26 | chalk-rust-ir = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" } | 26 | chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "151949dece8117d180b5d197a7afa968c3ba14bb" } |
27 | chalk-ir = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" } | 27 | chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "151949dece8117d180b5d197a7afa968c3ba14bb" } |
28 | 28 | ||
29 | lalrpop-intern = "0.15.1" | 29 | lalrpop-intern = "0.15.1" |
30 | 30 | ||