diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-23 10:58:06 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-12-23 10:58:06 +0000 |
| commit | ce07a2daa9e53aa86a769f8641b14c2878444fbc (patch) | |
| tree | fc5802a209c642e862171a1d022634eefd2a03a9 /crates/ra_hir_ty/Cargo.toml | |
| parent | 31c5888a4c0913c44d13f25f8cb79e0701e84f71 (diff) | |
| parent | 1f7f4578f72721c1b0e17e8405f986fd2ce89aaf (diff) | |
Merge #2636
2636: Chalk update and refactoring r=flodiebold a=flodiebold
This updates the Chalk integration to https://github.com/rust-lang/chalk/pull/311, which will presumably get merged soon, and refactors it some more, most notably introducing our own `TypeFamily` instead of reusing `ChalkIr`. It's still mostly the same as `ChalkIr` though, except for using Salsa `InternId`s directly.
Co-authored-by: Florian Diebold <[email protected]>
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 d277bf2bc..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/rust-lang/chalk.git", rev = "151949dece8117d180b5d197a7afa968c3ba14bb" } | 25 | chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5" } |
| 26 | chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "151949dece8117d180b5d197a7afa968c3ba14bb" } | 26 | chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5" } |
| 27 | chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "151949dece8117d180b5d197a7afa968c3ba14bb" } | ||
| 28 | 27 | ||
| 29 | lalrpop-intern = "0.15.1" | 28 | lalrpop-intern = "0.15.1" |
| 30 | 29 | ||