diff options
-rw-r--r-- | Cargo.lock | 111 | ||||
-rw-r--r-- | crates/ra_hir_ty/Cargo.toml | 6 |
2 files changed, 47 insertions, 70 deletions
diff --git a/Cargo.lock b/Cargo.lock index d80e58548..caa52fb69 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -53,7 +53,7 @@ name = "backtrace-sys" | |||
53 | version = "0.1.32" | 53 | version = "0.1.32" |
54 | source = "registry+https://github.com/rust-lang/crates.io-index" | 54 | source = "registry+https://github.com/rust-lang/crates.io-index" |
55 | dependencies = [ | 55 | dependencies = [ |
56 | "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", | 56 | "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", |
57 | "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", | 57 | "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", |
58 | ] | 58 | ] |
59 | 59 | ||
@@ -112,12 +112,12 @@ dependencies = [ | |||
112 | "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", | 112 | "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", |
113 | "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", | 113 | "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", |
114 | "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", | 114 | "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", |
115 | "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", | 115 | "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", |
116 | ] | 116 | ] |
117 | 117 | ||
118 | [[package]] | 118 | [[package]] |
119 | name = "cc" | 119 | name = "cc" |
120 | version = "1.0.47" | 120 | version = "1.0.48" |
121 | source = "registry+https://github.com/rust-lang/crates.io-index" | 121 | source = "registry+https://github.com/rust-lang/crates.io-index" |
122 | 122 | ||
123 | [[package]] | 123 | [[package]] |
@@ -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/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30#095cd38a4f16337913bba487f2055b9ca0179f30" | 131 | source = "git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb#151949dece8117d180b5d197a7afa968c3ba14bb" |
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,28 +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/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30#095cd38a4f16337913bba487f2055b9ca0179f30" | 141 | source = "git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb#151949dece8117d180b5d197a7afa968c3ba14bb" |
142 | dependencies = [ | 142 | dependencies = [ |
143 | "chalk-macros 0.1.1 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 143 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
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 | "stacker 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", | ||
146 | ] | 145 | ] |
147 | 146 | ||
148 | [[package]] | 147 | [[package]] |
149 | name = "chalk-ir" | 148 | name = "chalk-ir" |
150 | version = "0.1.0" | 149 | version = "0.1.0" |
151 | source = "git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30#095cd38a4f16337913bba487f2055b9ca0179f30" | 150 | source = "git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb#151949dece8117d180b5d197a7afa968c3ba14bb" |
152 | dependencies = [ | 151 | dependencies = [ |
153 | "chalk-derive 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 152 | "chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
154 | "chalk-engine 0.9.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 153 | "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
155 | "chalk-macros 0.1.1 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 154 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
156 | "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)", |
157 | ] | 156 | ] |
158 | 157 | ||
159 | [[package]] | 158 | [[package]] |
160 | name = "chalk-macros" | 159 | name = "chalk-macros" |
161 | version = "0.1.1" | 160 | version = "0.1.1" |
162 | source = "git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30#095cd38a4f16337913bba487f2055b9ca0179f30" | 161 | source = "git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb#151949dece8117d180b5d197a7afa968c3ba14bb" |
163 | dependencies = [ | 162 | dependencies = [ |
164 | "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)", |
165 | ] | 164 | ] |
@@ -167,24 +166,24 @@ dependencies = [ | |||
167 | [[package]] | 166 | [[package]] |
168 | name = "chalk-rust-ir" | 167 | name = "chalk-rust-ir" |
169 | version = "0.1.0" | 168 | version = "0.1.0" |
170 | source = "git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30#095cd38a4f16337913bba487f2055b9ca0179f30" | 169 | source = "git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb#151949dece8117d180b5d197a7afa968c3ba14bb" |
171 | dependencies = [ | 170 | dependencies = [ |
172 | "chalk-derive 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 171 | "chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
173 | "chalk-engine 0.9.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 172 | "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
174 | "chalk-ir 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 173 | "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
175 | "chalk-macros 0.1.1 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 174 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
176 | ] | 175 | ] |
177 | 176 | ||
178 | [[package]] | 177 | [[package]] |
179 | name = "chalk-solve" | 178 | name = "chalk-solve" |
180 | version = "0.1.0" | 179 | version = "0.1.0" |
181 | source = "git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30#095cd38a4f16337913bba487f2055b9ca0179f30" | 180 | source = "git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb#151949dece8117d180b5d197a7afa968c3ba14bb" |
182 | dependencies = [ | 181 | dependencies = [ |
183 | "chalk-derive 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 182 | "chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
184 | "chalk-engine 0.9.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 183 | "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
185 | "chalk-ir 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 184 | "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
186 | "chalk-macros 0.1.1 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 185 | "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
187 | "chalk-rust-ir 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 186 | "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
188 | "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)", |
189 | "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)", |
190 | "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)", |
@@ -493,7 +492,7 @@ dependencies = [ | |||
493 | "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", | 492 | "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", |
494 | "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 493 | "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
495 | "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", | 494 | "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", |
496 | "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", | 495 | "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", |
497 | "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", | 496 | "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", |
498 | "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", | 497 | "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", |
499 | ] | 498 | ] |
@@ -534,7 +533,7 @@ name = "jemalloc-sys" | |||
534 | version = "0.3.2" | 533 | version = "0.3.2" |
535 | source = "registry+https://github.com/rust-lang/crates.io-index" | 534 | source = "registry+https://github.com/rust-lang/crates.io-index" |
536 | dependencies = [ | 535 | dependencies = [ |
537 | "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", | 536 | "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", |
538 | "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", | 537 | "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", |
539 | "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", | 538 | "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", |
540 | ] | 539 | ] |
@@ -616,7 +615,7 @@ dependencies = [ | |||
616 | "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 615 | "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
617 | "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", | 616 | "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", |
618 | "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", | 617 | "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", |
619 | "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", | 618 | "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", |
620 | ] | 619 | ] |
621 | 620 | ||
622 | [[package]] | 621 | [[package]] |
@@ -626,7 +625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
626 | dependencies = [ | 625 | dependencies = [ |
627 | "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", | 626 | "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", |
628 | "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", | 627 | "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", |
629 | "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", | 628 | "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", |
630 | "serde_repr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", | 629 | "serde_repr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", |
631 | "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", | 630 | "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", |
632 | ] | 631 | ] |
@@ -669,7 +668,7 @@ dependencies = [ | |||
669 | 668 | ||
670 | [[package]] | 669 | [[package]] |
671 | name = "mio-extras" | 670 | name = "mio-extras" |
672 | version = "2.0.5" | 671 | version = "2.0.6" |
673 | source = "registry+https://github.com/rust-lang/crates.io-index" | 672 | source = "registry+https://github.com/rust-lang/crates.io-index" |
674 | dependencies = [ | 673 | dependencies = [ |
675 | "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", | 674 | "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -712,7 +711,7 @@ dependencies = [ | |||
712 | "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", | 711 | "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", |
713 | "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", | 712 | "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", |
714 | "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", | 713 | "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", |
715 | "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)", | 714 | "mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)", |
716 | "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", | 715 | "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", |
717 | "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", | 716 | "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", |
718 | ] | 717 | ] |
@@ -846,14 +845,6 @@ dependencies = [ | |||
846 | ] | 845 | ] |
847 | 846 | ||
848 | [[package]] | 847 | [[package]] |
849 | name = "psm" | ||
850 | version = "0.1.6" | ||
851 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
852 | dependencies = [ | ||
853 | "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", | ||
854 | ] | ||
855 | |||
856 | [[package]] | ||
857 | name = "quick-error" | 848 | name = "quick-error" |
858 | version = "1.2.2" | 849 | version = "1.2.2" |
859 | source = "registry+https://github.com/rust-lang/crates.io-index" | 850 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -1002,9 +993,9 @@ name = "ra_hir_ty" | |||
1002 | version = "0.1.0" | 993 | version = "0.1.0" |
1003 | dependencies = [ | 994 | dependencies = [ |
1004 | "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", | 995 | "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1005 | "chalk-ir 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 996 | "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
1006 | "chalk-rust-ir 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 997 | "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
1007 | "chalk-solve 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)", | 998 | "chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)", |
1008 | "ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", | 999 | "ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1009 | "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1000 | "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1010 | "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1001 | "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1069,7 +1060,7 @@ dependencies = [ | |||
1069 | "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1060 | "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1070 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1061 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1071 | "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", | 1062 | "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", |
1072 | "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", | 1063 | "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", |
1073 | "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1064 | "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1074 | "test_utils 0.1.0", | 1065 | "test_utils 0.1.0", |
1075 | "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1066 | "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1117,7 +1108,7 @@ dependencies = [ | |||
1117 | "ra_db 0.1.0", | 1108 | "ra_db 0.1.0", |
1118 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1109 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1119 | "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", | 1110 | "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", |
1120 | "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", | 1111 | "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", |
1121 | ] | 1112 | ] |
1122 | 1113 | ||
1123 | [[package]] | 1114 | [[package]] |
@@ -1510,7 +1501,7 @@ dependencies = [ | |||
1510 | 1501 | ||
1511 | [[package]] | 1502 | [[package]] |
1512 | name = "serde_json" | 1503 | name = "serde_json" |
1513 | version = "1.0.42" | 1504 | version = "1.0.44" |
1514 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1505 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1515 | dependencies = [ | 1506 | dependencies = [ |
1516 | "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", | 1507 | "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1558,18 +1549,6 @@ dependencies = [ | |||
1558 | ] | 1549 | ] |
1559 | 1550 | ||
1560 | [[package]] | 1551 | [[package]] |
1561 | name = "stacker" | ||
1562 | version = "0.1.6" | ||
1563 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1564 | dependencies = [ | ||
1565 | "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", | ||
1566 | "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", | ||
1567 | "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", | ||
1568 | "psm 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", | ||
1569 | "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", | ||
1570 | ] | ||
1571 | |||
1572 | [[package]] | ||
1573 | name = "superslice" | 1552 | name = "superslice" |
1574 | version = "1.0.0" | 1553 | version = "1.0.0" |
1575 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1554 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -1610,7 +1589,7 @@ name = "test_utils" | |||
1610 | version = "0.1.0" | 1589 | version = "0.1.0" |
1611 | dependencies = [ | 1590 | dependencies = [ |
1612 | "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1591 | "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", |
1613 | "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", | 1592 | "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", |
1614 | "text_unit 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", | 1593 | "text_unit 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", |
1615 | ] | 1594 | ] |
1616 | 1595 | ||
@@ -1798,14 +1777,14 @@ dependencies = [ | |||
1798 | "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" | 1777 | "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" |
1799 | "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" | 1778 | "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" |
1800 | "checksum cargo_metadata 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202" | 1779 | "checksum cargo_metadata 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202" |
1801 | "checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8" | 1780 | "checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" |
1802 | "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" | 1781 | "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" |
1803 | "checksum chalk-derive 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)" = "<none>" | 1782 | "checksum chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)" = "<none>" |
1804 | "checksum chalk-engine 0.9.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)" = "<none>" | 1783 | "checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)" = "<none>" |
1805 | "checksum chalk-ir 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)" = "<none>" | 1784 | "checksum chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)" = "<none>" |
1806 | "checksum chalk-macros 0.1.1 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)" = "<none>" | 1785 | "checksum chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)" = "<none>" |
1807 | "checksum chalk-rust-ir 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)" = "<none>" | 1786 | "checksum chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)" = "<none>" |
1808 | "checksum chalk-solve 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)" = "<none>" | 1787 | "checksum chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=151949dece8117d180b5d197a7afa968c3ba14bb)" = "<none>" |
1809 | "checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" | 1788 | "checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" |
1810 | "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" | 1789 | "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" |
1811 | "checksum console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f5d540c2d34ac9dd0deb5f3b5f54c36c79efa78f6b3ad19106a554d07a7b5d9f" | 1790 | "checksum console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f5d540c2d34ac9dd0deb5f3b5f54c36c79efa78f6b3ad19106a554d07a7b5d9f" |
@@ -1865,7 +1844,7 @@ dependencies = [ | |||
1865 | "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" | 1844 | "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" |
1866 | "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" | 1845 | "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" |
1867 | "checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" | 1846 | "checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" |
1868 | "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40" | 1847 | "checksum mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" |
1869 | "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" | 1848 | "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" |
1870 | "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" | 1849 | "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" |
1871 | "checksum notify 4.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "199628fc33b21bc767baa057490b00b382ecbae030803a7b36292422d15b778b" | 1850 | "checksum notify 4.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "199628fc33b21bc767baa057490b00b382ecbae030803a7b36292422d15b778b" |
@@ -1884,7 +1863,6 @@ dependencies = [ | |||
1884 | "checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" | 1863 | "checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" |
1885 | "checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" | 1864 | "checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" |
1886 | "checksum proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cf147e022eacf0c8a054ab864914a7602618adba841d800a9a9868a5237a529f" | 1865 | "checksum proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cf147e022eacf0c8a054ab864914a7602618adba841d800a9a9868a5237a529f" |
1887 | "checksum psm 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b14fc68b454f875abc8354c2555e1d56596f74833ddc0f77f87f4871ed6a30e0" | ||
1888 | "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" | 1866 | "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" |
1889 | "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" | 1867 | "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" |
1890 | "checksum ra_vfs 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc898f237e4b4498959ae0100c688793a23e77624d44ef710ba70094217f98e0" | 1868 | "checksum ra_vfs 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc898f237e4b4498959ae0100c688793a23e77624d44ef710ba70094217f98e0" |
@@ -1926,13 +1904,12 @@ dependencies = [ | |||
1926 | "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" | 1904 | "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" |
1927 | "checksum serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702" | 1905 | "checksum serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702" |
1928 | "checksum serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0" | 1906 | "checksum serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0" |
1929 | "checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043" | 1907 | "checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7" |
1930 | "checksum serde_repr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "cd02c7587ec314570041b2754829f84d873ced14a96d1fd1823531e11db40573" | 1908 | "checksum serde_repr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "cd02c7587ec314570041b2754829f84d873ced14a96d1fd1823531e11db40573" |
1931 | "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" | 1909 | "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" |
1932 | "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" | 1910 | "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" |
1933 | "checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" | 1911 | "checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" |
1934 | "checksum smol_str 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34836c9a295c62c2ce3514471117c5cb269891e8421b2aafdd910050576c4d8b" | 1912 | "checksum smol_str 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34836c9a295c62c2ce3514471117c5cb269891e8421b2aafdd910050576c4d8b" |
1935 | "checksum stacker 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d96fc4f13a0ac088e9a3cd9af1cc8c5cc1ab5deb2145cef661267dfc9c542f8a" | ||
1936 | "checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f" | 1913 | "checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f" |
1937 | "checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238" | 1914 | "checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238" |
1938 | "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" | 1915 | "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" |
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml index 429242870..d277bf2bc 100644 --- a/crates/ra_hir_ty/Cargo.toml +++ b/crates/ra_hir_ty/Cargo.toml | |||
@@ -22,9 +22,9 @@ 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 | # https://github.com/rust-lang/chalk/pull/294 |
25 | chalk-solve = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" } | 25 | chalk-solve = { git = "https://github.com/rust-lang/chalk.git", rev = "151949dece8117d180b5d197a7afa968c3ba14bb" } |
26 | chalk-rust-ir = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" } | 26 | chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "151949dece8117d180b5d197a7afa968c3ba14bb" } |
27 | chalk-ir = { git = "https://github.com/jackh726/chalk.git", rev = "095cd38a4f16337913bba487f2055b9ca0179f30" } | 27 | chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "151949dece8117d180b5d197a7afa968c3ba14bb" } |
28 | 28 | ||
29 | lalrpop-intern = "0.15.1" | 29 | lalrpop-intern = "0.15.1" |
30 | 30 | ||