diff options
author | Florian Diebold <[email protected]> | 2019-11-02 14:32:08 +0000 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2019-11-02 14:32:08 +0000 |
commit | c5e44b208418c7090d9dd4bf3e5bc4dc140af91a (patch) | |
tree | 813ff927513be2d2c31640e5beca8fc16f40b802 | |
parent | eb8f76a86fe88fcad370577b344f397dd6118cfd (diff) |
Upgrade Chalk
-rw-r--r-- | Cargo.lock | 54 | ||||
-rw-r--r-- | crates/ra_hir/Cargo.toml | 6 |
2 files changed, 30 insertions, 30 deletions
diff --git a/Cargo.lock b/Cargo.lock index 10f51403a..29f77044e 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -126,7 +126,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
126 | [[package]] | 126 | [[package]] |
127 | name = "chalk-derive" | 127 | name = "chalk-derive" |
128 | version = "0.1.0" | 128 | version = "0.1.0" |
129 | source = "git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809#8314f2fcec8582a58c24b638f1a259d4145a0809" | 129 | source = "git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05#50f9f636123bd88d0cc1b958749981d6702e4d05" |
130 | dependencies = [ | 130 | dependencies = [ |
131 | "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", | 131 | "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", |
132 | "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", | 132 | "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -136,9 +136,9 @@ dependencies = [ | |||
136 | [[package]] | 136 | [[package]] |
137 | name = "chalk-engine" | 137 | name = "chalk-engine" |
138 | version = "0.9.0" | 138 | version = "0.9.0" |
139 | source = "git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809#8314f2fcec8582a58c24b638f1a259d4145a0809" | 139 | source = "git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05#50f9f636123bd88d0cc1b958749981d6702e4d05" |
140 | dependencies = [ | 140 | dependencies = [ |
141 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)", | 141 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)", |
142 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 142 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
143 | "stacker 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", | 143 | "stacker 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", |
144 | ] | 144 | ] |
@@ -146,18 +146,18 @@ dependencies = [ | |||
146 | [[package]] | 146 | [[package]] |
147 | name = "chalk-ir" | 147 | name = "chalk-ir" |
148 | version = "0.1.0" | 148 | version = "0.1.0" |
149 | source = "git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809#8314f2fcec8582a58c24b638f1a259d4145a0809" | 149 | source = "git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05#50f9f636123bd88d0cc1b958749981d6702e4d05" |
150 | dependencies = [ | 150 | dependencies = [ |
151 | "chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)", | 151 | "chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)", |
152 | "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)", | 152 | "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)", |
153 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)", | 153 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)", |
154 | "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", | 154 | "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", |
155 | ] | 155 | ] |
156 | 156 | ||
157 | [[package]] | 157 | [[package]] |
158 | name = "chalk-macros" | 158 | name = "chalk-macros" |
159 | version = "0.1.1" | 159 | version = "0.1.1" |
160 | source = "git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809#8314f2fcec8582a58c24b638f1a259d4145a0809" | 160 | source = "git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05#50f9f636123bd88d0cc1b958749981d6702e4d05" |
161 | dependencies = [ | 161 | dependencies = [ |
162 | "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 162 | "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
163 | ] | 163 | ] |
@@ -165,23 +165,23 @@ dependencies = [ | |||
165 | [[package]] | 165 | [[package]] |
166 | name = "chalk-rust-ir" | 166 | name = "chalk-rust-ir" |
167 | version = "0.1.0" | 167 | version = "0.1.0" |
168 | source = "git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809#8314f2fcec8582a58c24b638f1a259d4145a0809" | 168 | source = "git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05#50f9f636123bd88d0cc1b958749981d6702e4d05" |
169 | dependencies = [ | 169 | dependencies = [ |
170 | "chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)", | 170 | "chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)", |
171 | "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)", | 171 | "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)", |
172 | "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)", | 172 | "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)", |
173 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)", | 173 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)", |
174 | ] | 174 | ] |
175 | 175 | ||
176 | [[package]] | 176 | [[package]] |
177 | name = "chalk-solve" | 177 | name = "chalk-solve" |
178 | version = "0.1.0" | 178 | version = "0.1.0" |
179 | source = "git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809#8314f2fcec8582a58c24b638f1a259d4145a0809" | 179 | source = "git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05#50f9f636123bd88d0cc1b958749981d6702e4d05" |
180 | dependencies = [ | 180 | dependencies = [ |
181 | "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)", | 181 | "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)", |
182 | "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)", | 182 | "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)", |
183 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)", | 183 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)", |
184 | "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)", | 184 | "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)", |
185 | "ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", | 185 | "ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", |
186 | "itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", | 186 | "itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", |
187 | "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", | 187 | "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1000,9 +1000,9 @@ name = "ra_hir" | |||
1000 | version = "0.1.0" | 1000 | version = "0.1.0" |
1001 | dependencies = [ | 1001 | dependencies = [ |
1002 | "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1002 | "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1003 | "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)", | 1003 | "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)", |
1004 | "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)", | 1004 | "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)", |
1005 | "chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)", | 1005 | "chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)", |
1006 | "ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1006 | "ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1007 | "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1007 | "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1008 | "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1008 | "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1849,12 +1849,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1849 | "checksum cargo_metadata 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8d2d1617e838936c0d2323a65cc151e03ae19a7678dd24f72bccf27119b90a5d" | 1849 | "checksum cargo_metadata 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8d2d1617e838936c0d2323a65cc151e03ae19a7678dd24f72bccf27119b90a5d" |
1850 | "checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c" | 1850 | "checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c" |
1851 | "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" | 1851 | "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" |
1852 | "checksum chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)" = "<none>" | 1852 | "checksum chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)" = "<none>" |
1853 | "checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)" = "<none>" | 1853 | "checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)" = "<none>" |
1854 | "checksum chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)" = "<none>" | 1854 | "checksum chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)" = "<none>" |
1855 | "checksum chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)" = "<none>" | 1855 | "checksum chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)" = "<none>" |
1856 | "checksum chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)" = "<none>" | 1856 | "checksum chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)" = "<none>" |
1857 | "checksum chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=8314f2fcec8582a58c24b638f1a259d4145a0809)" = "<none>" | 1857 | "checksum chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=50f9f636123bd88d0cc1b958749981d6702e4d05)" = "<none>" |
1858 | "checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" | 1858 | "checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" |
1859 | "checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" | 1859 | "checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" |
1860 | "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" | 1860 | "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" |
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index 5df371bc0..fae5dc7cb 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml | |||
@@ -24,9 +24,9 @@ hir_def = { path = "../ra_hir_def", package = "ra_hir_def" } | |||
24 | test_utils = { path = "../test_utils" } | 24 | test_utils = { path = "../test_utils" } |
25 | ra_prof = { path = "../ra_prof" } | 25 | ra_prof = { path = "../ra_prof" } |
26 | 26 | ||
27 | chalk-solve = { git = "https://github.com/rust-lang/chalk.git", rev = "8314f2fcec8582a58c24b638f1a259d4145a0809" } | 27 | chalk-solve = { git = "https://github.com/rust-lang/chalk.git", rev = "50f9f636123bd88d0cc1b958749981d6702e4d05" } |
28 | chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "8314f2fcec8582a58c24b638f1a259d4145a0809" } | 28 | chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "50f9f636123bd88d0cc1b958749981d6702e4d05" } |
29 | chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "8314f2fcec8582a58c24b638f1a259d4145a0809" } | 29 | chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "50f9f636123bd88d0cc1b958749981d6702e4d05" } |
30 | lalrpop-intern = "0.15.1" | 30 | lalrpop-intern = "0.15.1" |
31 | 31 | ||
32 | [dev-dependencies] | 32 | [dev-dependencies] |