diff options
-rw-r--r-- | Cargo.lock | 32 | ||||
-rw-r--r-- | crates/hir_ty/Cargo.toml | 6 | ||||
-rw-r--r-- | crates/hir_ty/src/traits/chalk/interner.rs | 5 | ||||
-rw-r--r-- | crates/syntax/Cargo.toml | 2 |
4 files changed, 23 insertions, 22 deletions
diff --git a/Cargo.lock b/Cargo.lock index 894fadcb2..f958bcbf3 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -178,9 +178,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" | |||
178 | 178 | ||
179 | [[package]] | 179 | [[package]] |
180 | name = "chalk-derive" | 180 | name = "chalk-derive" |
181 | version = "0.55.0" | 181 | version = "0.56.0" |
182 | source = "registry+https://github.com/rust-lang/crates.io-index" | 182 | source = "registry+https://github.com/rust-lang/crates.io-index" |
183 | checksum = "3983193cacd81f0f924acb666b7fe5e1a0d81db9f113fa69203eda7ea8ce8b6c" | 183 | checksum = "51f6c7a4b1a119cff6c5a17cf68056069dece7bc525c2a2e26e1117e27f48ca2" |
184 | dependencies = [ | 184 | dependencies = [ |
185 | "proc-macro2", | 185 | "proc-macro2", |
186 | "quote", | 186 | "quote", |
@@ -190,9 +190,9 @@ dependencies = [ | |||
190 | 190 | ||
191 | [[package]] | 191 | [[package]] |
192 | name = "chalk-ir" | 192 | name = "chalk-ir" |
193 | version = "0.55.0" | 193 | version = "0.56.0" |
194 | source = "registry+https://github.com/rust-lang/crates.io-index" | 194 | source = "registry+https://github.com/rust-lang/crates.io-index" |
195 | checksum = "a522f53af971e7678f472d687e053120157b3ae26e2ebd5ecbc0f5ab124f2cb6" | 195 | checksum = "7d5f524bc3a5798fe3711c360fde350bffb938b52ef7b302d637550229995e20" |
196 | dependencies = [ | 196 | dependencies = [ |
197 | "bitflags", | 197 | "bitflags", |
198 | "chalk-derive", | 198 | "chalk-derive", |
@@ -201,9 +201,9 @@ dependencies = [ | |||
201 | 201 | ||
202 | [[package]] | 202 | [[package]] |
203 | name = "chalk-recursive" | 203 | name = "chalk-recursive" |
204 | version = "0.55.0" | 204 | version = "0.56.0" |
205 | source = "registry+https://github.com/rust-lang/crates.io-index" | 205 | source = "registry+https://github.com/rust-lang/crates.io-index" |
206 | checksum = "8b0a6bc94f16aaba1dd6d1e2350945bbb0239c3633cdabeedbed601c1354d4b4" | 206 | checksum = "f7c0525fb9c43f8f1d7ba4fb42f9ada2a2415901a04b5c655cfe11e559085d4d" |
207 | dependencies = [ | 207 | dependencies = [ |
208 | "chalk-derive", | 208 | "chalk-derive", |
209 | "chalk-ir", | 209 | "chalk-ir", |
@@ -214,9 +214,9 @@ dependencies = [ | |||
214 | 214 | ||
215 | [[package]] | 215 | [[package]] |
216 | name = "chalk-solve" | 216 | name = "chalk-solve" |
217 | version = "0.55.0" | 217 | version = "0.56.0" |
218 | source = "registry+https://github.com/rust-lang/crates.io-index" | 218 | source = "registry+https://github.com/rust-lang/crates.io-index" |
219 | checksum = "cdf79fb77a567e456a170f7ec84ea6584163d4ba3f13660cd182013d34ca667c" | 219 | checksum = "3c2e7b54add0f18d5ee7bb043a3108b819e60b1b409d214291bcdc97927cdc32" |
220 | dependencies = [ | 220 | dependencies = [ |
221 | "chalk-derive", | 221 | "chalk-derive", |
222 | "chalk-ir", | 222 | "chalk-ir", |
@@ -785,9 +785,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" | |||
785 | 785 | ||
786 | [[package]] | 786 | [[package]] |
787 | name = "libc" | 787 | name = "libc" |
788 | version = "0.2.85" | 788 | version = "0.2.86" |
789 | source = "registry+https://github.com/rust-lang/crates.io-index" | 789 | source = "registry+https://github.com/rust-lang/crates.io-index" |
790 | checksum = "7ccac4b00700875e6a07c6cde370d44d32fa01c5a65cdd2fca6858c479d28bb3" | 790 | checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" |
791 | 791 | ||
792 | [[package]] | 792 | [[package]] |
793 | name = "libloading" | 793 | name = "libloading" |
@@ -888,9 +888,9 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" | |||
888 | 888 | ||
889 | [[package]] | 889 | [[package]] |
890 | name = "memmap2" | 890 | name = "memmap2" |
891 | version = "0.2.0" | 891 | version = "0.2.1" |
892 | source = "registry+https://github.com/rust-lang/crates.io-index" | 892 | source = "registry+https://github.com/rust-lang/crates.io-index" |
893 | checksum = "e73be3b7d04a0123e933fea1d50d126cc7196bbc0362c0ce426694f777194eee" | 893 | checksum = "04e3e85b970d650e2ae6d70592474087051c11c54da7f7b4949725c5735fbcc6" |
894 | dependencies = [ | 894 | dependencies = [ |
895 | "libc", | 895 | "libc", |
896 | ] | 896 | ] |
@@ -1377,9 +1377,9 @@ dependencies = [ | |||
1377 | 1377 | ||
1378 | [[package]] | 1378 | [[package]] |
1379 | name = "rustc-ap-rustc_lexer" | 1379 | name = "rustc-ap-rustc_lexer" |
1380 | version = "702.0.0" | 1380 | version = "705.0.0" |
1381 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1381 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1382 | checksum = "47cfdb02425aed8c56f85692975d262cb438ea0388e0c8cd254e73bd22bb6539" | 1382 | checksum = "3a030d00510966cd31e13dca5e6c1bd40d303a932c54eca40e854188bca8c49e" |
1383 | dependencies = [ | 1383 | dependencies = [ |
1384 | "unicode-xid", | 1384 | "unicode-xid", |
1385 | ] | 1385 | ] |
@@ -1493,9 +1493,9 @@ dependencies = [ | |||
1493 | 1493 | ||
1494 | [[package]] | 1494 | [[package]] |
1495 | name = "serde_json" | 1495 | name = "serde_json" |
1496 | version = "1.0.61" | 1496 | version = "1.0.62" |
1497 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1497 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1498 | checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a" | 1498 | checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" |
1499 | dependencies = [ | 1499 | dependencies = [ |
1500 | "indexmap", | 1500 | "indexmap", |
1501 | "itoa", | 1501 | "itoa", |
diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml index f6bf49546..418ac8cbb 100644 --- a/crates/hir_ty/Cargo.toml +++ b/crates/hir_ty/Cargo.toml | |||
@@ -17,9 +17,9 @@ ena = "0.14.0" | |||
17 | log = "0.4.8" | 17 | log = "0.4.8" |
18 | rustc-hash = "1.1.0" | 18 | rustc-hash = "1.1.0" |
19 | scoped-tls = "1" | 19 | scoped-tls = "1" |
20 | chalk-solve = { version = "0.55", default-features = false } | 20 | chalk-solve = { version = "0.56", default-features = false } |
21 | chalk-ir = "0.55" | 21 | chalk-ir = "0.56" |
22 | chalk-recursive = "0.55" | 22 | chalk-recursive = "0.56" |
23 | la-arena = { version = "0.2.0", path = "../../lib/arena" } | 23 | la-arena = { version = "0.2.0", path = "../../lib/arena" } |
24 | 24 | ||
25 | stdx = { path = "../stdx", version = "0.0.0" } | 25 | stdx = { path = "../stdx", version = "0.0.0" } |
diff --git a/crates/hir_ty/src/traits/chalk/interner.rs b/crates/hir_ty/src/traits/chalk/interner.rs index 6a4aa8333..54bd1c724 100644 --- a/crates/hir_ty/src/traits/chalk/interner.rs +++ b/crates/hir_ty/src/traits/chalk/interner.rs | |||
@@ -193,8 +193,9 @@ impl chalk_ir::interner::Interner for Interner { | |||
193 | tls::with_current_program(|prog| Some(prog?.debug_quantified_where_clauses(clauses, fmt))) | 193 | tls::with_current_program(|prog| Some(prog?.debug_quantified_where_clauses(clauses, fmt))) |
194 | } | 194 | } |
195 | 195 | ||
196 | fn intern_ty(&self, ty: chalk_ir::TyData<Self>) -> Arc<chalk_ir::TyData<Self>> { | 196 | fn intern_ty(&self, kind: chalk_ir::TyKind<Self>) -> Arc<chalk_ir::TyData<Self>> { |
197 | Arc::new(ty) | 197 | let flags = kind.compute_flags(self); |
198 | Arc::new(chalk_ir::TyData { kind, flags }) | ||
198 | } | 199 | } |
199 | 200 | ||
200 | fn ty_data<'a>(&self, ty: &'a Arc<chalk_ir::TyData<Self>>) -> &'a chalk_ir::TyData<Self> { | 201 | fn ty_data<'a>(&self, ty: &'a Arc<chalk_ir::TyData<Self>>) -> &'a chalk_ir::TyData<Self> { |
diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml index aa6f6e0b6..e3ef71650 100644 --- a/crates/syntax/Cargo.toml +++ b/crates/syntax/Cargo.toml | |||
@@ -13,7 +13,7 @@ doctest = false | |||
13 | [dependencies] | 13 | [dependencies] |
14 | itertools = "0.10.0" | 14 | itertools = "0.10.0" |
15 | rowan = "0.12.2" | 15 | rowan = "0.12.2" |
16 | rustc_lexer = { version = "702.0.0", package = "rustc-ap-rustc_lexer" } | 16 | rustc_lexer = { version = "705.0.0", package = "rustc-ap-rustc_lexer" } |
17 | rustc-hash = "1.1.0" | 17 | rustc-hash = "1.1.0" |
18 | arrayvec = "0.5.1" | 18 | arrayvec = "0.5.1" |
19 | once_cell = "1.3.1" | 19 | once_cell = "1.3.1" |