diff options
| author | Seivan Heidari <[email protected]> | 2019-12-23 14:35:31 +0000 |
|---|---|---|
| committer | Seivan Heidari <[email protected]> | 2019-12-23 14:35:31 +0000 |
| commit | b21d9337d9200e2cfdc90b386591c72c302dc03e (patch) | |
| tree | f81f5c08f821115cee26fa4d3ceaae88c7807fd5 /crates/ra_hir_ty/Cargo.toml | |
| parent | 18a0937585b836ec5ed054b9ae48e0156ab6d9ef (diff) | |
| parent | ce07a2daa9e53aa86a769f8641b14c2878444fbc (diff) | |
Merge branch 'master' into feature/themes
Diffstat (limited to 'crates/ra_hir_ty/Cargo.toml')
| -rw-r--r-- | crates/ra_hir_ty/Cargo.toml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml index 429242870..60793db44 100644 --- a/crates/ra_hir_ty/Cargo.toml +++ b/crates/ra_hir_ty/Cargo.toml | |||
| @@ -21,10 +21,9 @@ ra_prof = { path = "../ra_prof" } | |||
| 21 | ra_syntax = { path = "../ra_syntax" } | 21 | 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 | chalk-solve = { git = "https://github.com/rust-lang/chalk.git", rev = "ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5" } |
| 25 | chalk-solve = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" } | 25 | chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5" } |
| 26 | chalk-rust-ir = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" } | 26 | chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5" } |
| 27 | chalk-ir = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" } | ||
| 28 | 27 | ||
| 29 | lalrpop-intern = "0.15.1" | 28 | lalrpop-intern = "0.15.1" |
| 30 | 29 | ||