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 /Cargo.lock | |
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 'Cargo.lock')
-rw-r--r-- | Cargo.lock | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/Cargo.lock b/Cargo.lock index 09ed2d6ba..e724c1a76 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -128,7 +128,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
128 | [[package]] | 128 | [[package]] |
129 | name = "chalk-derive" | 129 | name = "chalk-derive" |
130 | version = "0.1.0" | 130 | version = "0.1.0" |
131 | source = "git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb#151949dece8117d180b5d197a7afa968c3ba14bb" | 131 | source = "git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5#ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5" |
132 | dependencies = [ | 132 | dependencies = [ |
133 | "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", | 133 | "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", |
134 | "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", | 134 | "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -138,27 +138,27 @@ dependencies = [ | |||
138 | [[package]] | 138 | [[package]] |
139 | name = "chalk-engine" | 139 | name = "chalk-engine" |
140 | version = "0.9.0" | 140 | version = "0.9.0" |
141 | source = "git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb#151949dece8117d180b5d197a7afa968c3ba14bb" | 141 | source = "git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5#ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5" |
142 | dependencies = [ | 142 | dependencies = [ |
143 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 143 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
144 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 144 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
145 | ] | 145 | ] |
146 | 146 | ||
147 | [[package]] | 147 | [[package]] |
148 | name = "chalk-ir" | 148 | name = "chalk-ir" |
149 | version = "0.1.0" | 149 | version = "0.1.0" |
150 | source = "git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb#151949dece8117d180b5d197a7afa968c3ba14bb" | 150 | source = "git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5#ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5" |
151 | dependencies = [ | 151 | dependencies = [ |
152 | "chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 152 | "chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
153 | "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 153 | "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
154 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 154 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
155 | "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", | 155 | "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", |
156 | ] | 156 | ] |
157 | 157 | ||
158 | [[package]] | 158 | [[package]] |
159 | name = "chalk-macros" | 159 | name = "chalk-macros" |
160 | version = "0.1.1" | 160 | version = "0.1.1" |
161 | source = "git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb#151949dece8117d180b5d197a7afa968c3ba14bb" | 161 | source = "git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5#ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5" |
162 | dependencies = [ | 162 | dependencies = [ |
163 | "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 163 | "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
164 | ] | 164 | ] |
@@ -166,24 +166,24 @@ dependencies = [ | |||
166 | [[package]] | 166 | [[package]] |
167 | name = "chalk-rust-ir" | 167 | name = "chalk-rust-ir" |
168 | version = "0.1.0" | 168 | version = "0.1.0" |
169 | source = "git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb#151949dece8117d180b5d197a7afa968c3ba14bb" | 169 | source = "git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5#ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5" |
170 | dependencies = [ | 170 | dependencies = [ |
171 | "chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 171 | "chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
172 | "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 172 | "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
173 | "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 173 | "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
174 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 174 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
175 | ] | 175 | ] |
176 | 176 | ||
177 | [[package]] | 177 | [[package]] |
178 | name = "chalk-solve" | 178 | name = "chalk-solve" |
179 | version = "0.1.0" | 179 | version = "0.1.0" |
180 | source = "git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb#151949dece8117d180b5d197a7afa968c3ba14bb" | 180 | source = "git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5#ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5" |
181 | dependencies = [ | 181 | dependencies = [ |
182 | "chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 182 | "chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
183 | "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 183 | "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
184 | "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 184 | "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
185 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 185 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
186 | "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 186 | "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
187 | "ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", | 187 | "ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", |
188 | "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", | 188 | "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", |
189 | "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", | 189 | "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -995,9 +995,9 @@ name = "ra_hir_ty" | |||
995 | version = "0.1.0" | 995 | version = "0.1.0" |
996 | dependencies = [ | 996 | dependencies = [ |
997 | "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", | 997 | "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", |
998 | "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 998 | "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
999 | "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 999 | "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
1000 | "chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", | 1000 | "chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)", |
1001 | "ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1001 | "ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1002 | "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1002 | "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1003 | "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1003 | "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1782,12 +1782,12 @@ dependencies = [ | |||
1782 | "checksum cargo_metadata 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202" | 1782 | "checksum cargo_metadata 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202" |
1783 | "checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" | 1783 | "checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" |
1784 | "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" | 1784 | "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" |
1785 | "checksum chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)" = "<none>" | 1785 | "checksum chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)" = "<none>" |
1786 | "checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)" = "<none>" | 1786 | "checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)" = "<none>" |
1787 | "checksum chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)" = "<none>" | 1787 | "checksum chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)" = "<none>" |
1788 | "checksum chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)" = "<none>" | 1788 | "checksum chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)" = "<none>" |
1789 | "checksum chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)" = "<none>" | 1789 | "checksum chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)" = "<none>" |
1790 | "checksum chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)" = "<none>" | 1790 | "checksum chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)" = "<none>" |
1791 | "checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" | 1791 | "checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" |
1792 | "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" | 1792 | "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" |
1793 | "checksum console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f5d540c2d34ac9dd0deb5f3b5f54c36c79efa78f6b3ad19106a554d07a7b5d9f" | 1793 | "checksum console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f5d540c2d34ac9dd0deb5f3b5f54c36c79efa78f6b3ad19106a554d07a7b5d9f" |