diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-04-06 08:49:09 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-04-06 08:49:09 +0100 |
commit | a93a04fc9e48bdcc9132738c391de77bd25dca7e (patch) | |
tree | 70ad7c87e686111e3d2e150aea08612713b46079 /Cargo.lock | |
parent | 0625c76009d394bf73eb13c3de65304ce4283a1c (diff) | |
parent | 952714685a7c0e0a1c9970839ce307806adaa176 (diff) |
Merge #3744
3744: Upgrade Chalk r=matklad a=flodiebold
Co-authored-by: Florian Diebold <[email protected]>
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'Cargo.lock')
-rw-r--r-- | Cargo.lock | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/Cargo.lock b/Cargo.lock index d277d6cfd..504db0c72 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -114,7 +114,7 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" | |||
114 | [[package]] | 114 | [[package]] |
115 | name = "chalk-derive" | 115 | name = "chalk-derive" |
116 | version = "0.1.0" | 116 | version = "0.1.0" |
117 | source = "git+https://github.com/rust-lang/chalk.git?rev=177d71340acc7a7204a33115fc63075d86452179#177d71340acc7a7204a33115fc63075d86452179" | 117 | source = "git+https://github.com/rust-lang/chalk.git?rev=039fc904a05f8cb3d0c682c9a57a63dda7a35356#039fc904a05f8cb3d0c682c9a57a63dda7a35356" |
118 | dependencies = [ | 118 | dependencies = [ |
119 | "proc-macro2", | 119 | "proc-macro2", |
120 | "quote", | 120 | "quote", |
@@ -124,7 +124,7 @@ dependencies = [ | |||
124 | [[package]] | 124 | [[package]] |
125 | name = "chalk-engine" | 125 | name = "chalk-engine" |
126 | version = "0.9.0" | 126 | version = "0.9.0" |
127 | source = "git+https://github.com/rust-lang/chalk.git?rev=177d71340acc7a7204a33115fc63075d86452179#177d71340acc7a7204a33115fc63075d86452179" | 127 | source = "git+https://github.com/rust-lang/chalk.git?rev=039fc904a05f8cb3d0c682c9a57a63dda7a35356#039fc904a05f8cb3d0c682c9a57a63dda7a35356" |
128 | dependencies = [ | 128 | dependencies = [ |
129 | "chalk-macros", | 129 | "chalk-macros", |
130 | "rustc-hash", | 130 | "rustc-hash", |
@@ -133,7 +133,7 @@ dependencies = [ | |||
133 | [[package]] | 133 | [[package]] |
134 | name = "chalk-ir" | 134 | name = "chalk-ir" |
135 | version = "0.1.0" | 135 | version = "0.1.0" |
136 | source = "git+https://github.com/rust-lang/chalk.git?rev=177d71340acc7a7204a33115fc63075d86452179#177d71340acc7a7204a33115fc63075d86452179" | 136 | source = "git+https://github.com/rust-lang/chalk.git?rev=039fc904a05f8cb3d0c682c9a57a63dda7a35356#039fc904a05f8cb3d0c682c9a57a63dda7a35356" |
137 | dependencies = [ | 137 | dependencies = [ |
138 | "chalk-derive", | 138 | "chalk-derive", |
139 | "chalk-engine", | 139 | "chalk-engine", |
@@ -143,7 +143,7 @@ dependencies = [ | |||
143 | [[package]] | 143 | [[package]] |
144 | name = "chalk-macros" | 144 | name = "chalk-macros" |
145 | version = "0.1.1" | 145 | version = "0.1.1" |
146 | source = "git+https://github.com/rust-lang/chalk.git?rev=177d71340acc7a7204a33115fc63075d86452179#177d71340acc7a7204a33115fc63075d86452179" | 146 | source = "git+https://github.com/rust-lang/chalk.git?rev=039fc904a05f8cb3d0c682c9a57a63dda7a35356#039fc904a05f8cb3d0c682c9a57a63dda7a35356" |
147 | dependencies = [ | 147 | dependencies = [ |
148 | "lazy_static", | 148 | "lazy_static", |
149 | ] | 149 | ] |
@@ -151,7 +151,7 @@ dependencies = [ | |||
151 | [[package]] | 151 | [[package]] |
152 | name = "chalk-rust-ir" | 152 | name = "chalk-rust-ir" |
153 | version = "0.1.0" | 153 | version = "0.1.0" |
154 | source = "git+https://github.com/rust-lang/chalk.git?rev=177d71340acc7a7204a33115fc63075d86452179#177d71340acc7a7204a33115fc63075d86452179" | 154 | source = "git+https://github.com/rust-lang/chalk.git?rev=039fc904a05f8cb3d0c682c9a57a63dda7a35356#039fc904a05f8cb3d0c682c9a57a63dda7a35356" |
155 | dependencies = [ | 155 | dependencies = [ |
156 | "chalk-derive", | 156 | "chalk-derive", |
157 | "chalk-engine", | 157 | "chalk-engine", |
@@ -162,7 +162,7 @@ dependencies = [ | |||
162 | [[package]] | 162 | [[package]] |
163 | name = "chalk-solve" | 163 | name = "chalk-solve" |
164 | version = "0.1.0" | 164 | version = "0.1.0" |
165 | source = "git+https://github.com/rust-lang/chalk.git?rev=177d71340acc7a7204a33115fc63075d86452179#177d71340acc7a7204a33115fc63075d86452179" | 165 | source = "git+https://github.com/rust-lang/chalk.git?rev=039fc904a05f8cb3d0c682c9a57a63dda7a35356#039fc904a05f8cb3d0c682c9a57a63dda7a35356" |
166 | dependencies = [ | 166 | dependencies = [ |
167 | "chalk-derive", | 167 | "chalk-derive", |
168 | "chalk-engine", | 168 | "chalk-engine", |
@@ -170,7 +170,7 @@ dependencies = [ | |||
170 | "chalk-macros", | 170 | "chalk-macros", |
171 | "chalk-rust-ir", | 171 | "chalk-rust-ir", |
172 | "ena", | 172 | "ena", |
173 | "itertools 0.8.2", | 173 | "itertools", |
174 | "petgraph", | 174 | "petgraph", |
175 | "rustc-hash", | 175 | "rustc-hash", |
176 | ] | 176 | ] |
@@ -507,15 +507,6 @@ dependencies = [ | |||
507 | 507 | ||
508 | [[package]] | 508 | [[package]] |
509 | name = "itertools" | 509 | name = "itertools" |
510 | version = "0.8.2" | ||
511 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
512 | checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" | ||
513 | dependencies = [ | ||
514 | "either", | ||
515 | ] | ||
516 | |||
517 | [[package]] | ||
518 | name = "itertools" | ||
519 | version = "0.9.0" | 510 | version = "0.9.0" |
520 | source = "registry+https://github.com/rust-lang/crates.io-index" | 511 | source = "registry+https://github.com/rust-lang/crates.io-index" |
521 | checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" | 512 | checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" |
@@ -873,7 +864,7 @@ name = "ra_assists" | |||
873 | version = "0.1.0" | 864 | version = "0.1.0" |
874 | dependencies = [ | 865 | dependencies = [ |
875 | "either", | 866 | "either", |
876 | "itertools 0.9.0", | 867 | "itertools", |
877 | "ra_db", | 868 | "ra_db", |
878 | "ra_fmt", | 869 | "ra_fmt", |
879 | "ra_hir", | 870 | "ra_hir", |
@@ -927,7 +918,7 @@ dependencies = [ | |||
927 | name = "ra_fmt" | 918 | name = "ra_fmt" |
928 | version = "0.1.0" | 919 | version = "0.1.0" |
929 | dependencies = [ | 920 | dependencies = [ |
930 | "itertools 0.9.0", | 921 | "itertools", |
931 | "ra_syntax", | 922 | "ra_syntax", |
932 | ] | 923 | ] |
933 | 924 | ||
@@ -937,7 +928,7 @@ version = "0.1.0" | |||
937 | dependencies = [ | 928 | dependencies = [ |
938 | "arrayvec", | 929 | "arrayvec", |
939 | "either", | 930 | "either", |
940 | "itertools 0.9.0", | 931 | "itertools", |
941 | "log", | 932 | "log", |
942 | "ra_db", | 933 | "ra_db", |
943 | "ra_hir_def", | 934 | "ra_hir_def", |
@@ -1015,7 +1006,7 @@ dependencies = [ | |||
1015 | "either", | 1006 | "either", |
1016 | "indexmap", | 1007 | "indexmap", |
1017 | "insta", | 1008 | "insta", |
1018 | "itertools 0.9.0", | 1009 | "itertools", |
1019 | "log", | 1010 | "log", |
1020 | "ra_assists", | 1011 | "ra_assists", |
1021 | "ra_cfg", | 1012 | "ra_cfg", |
@@ -1127,7 +1118,7 @@ name = "ra_syntax" | |||
1127 | version = "0.1.0" | 1118 | version = "0.1.0" |
1128 | dependencies = [ | 1119 | dependencies = [ |
1129 | "arrayvec", | 1120 | "arrayvec", |
1130 | "itertools 0.9.0", | 1121 | "itertools", |
1131 | "once_cell", | 1122 | "once_cell", |
1132 | "ra_parser", | 1123 | "ra_parser", |
1133 | "ra_text_edit", | 1124 | "ra_text_edit", |
@@ -1305,7 +1296,7 @@ dependencies = [ | |||
1305 | "crossbeam-channel", | 1296 | "crossbeam-channel", |
1306 | "env_logger", | 1297 | "env_logger", |
1307 | "globset", | 1298 | "globset", |
1308 | "itertools 0.9.0", | 1299 | "itertools", |
1309 | "jod-thread", | 1300 | "jod-thread", |
1310 | "log", | 1301 | "log", |
1311 | "lsp-server", | 1302 | "lsp-server", |