diff options
| author | Laurențiu Nicola <lnicola@dend.ro> | 2021-02-02 17:07:10 +0200 |
|---|---|---|
| committer | Laurențiu Nicola <lnicola@dend.ro> | 2021-02-02 17:40:01 +0200 |
| commit | 9c4b799dce89c8629b4f8cc98d0d8e25e6c05eaa (patch) | |
| tree | 0f657743573778f56e46ed5230998f2a88699b9e | |
| parent | 042e07d89171fa5dd8ba4fc572c183687382c0d7 (diff) | |
| download | rust-9c4b799dce89c8629b4f8cc98d0d8e25e6c05eaa.tar.gz rust-9c4b799dce89c8629b4f8cc98d0d8e25e6c05eaa.zip | |
Bump chalk
| -rw-r--r-- | Cargo.lock | 16 | ||||
| -rw-r--r-- | crates/hir_ty/Cargo.toml | 6 | ||||
| -rw-r--r-- | crates/hir_ty/src/traits/chalk.rs | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/Cargo.lock b/Cargo.lock index 9c26a0bf787..50c9d36ba59 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,9 +178,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chalk-derive" -version = "0.51.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a2ad10b964771ffc53ce7a8d6fce4bde3da0da82a1bc7a72668548db1c56ee" +checksum = "3983193cacd81f0f924acb666b7fe5e1a0d81db9f113fa69203eda7ea8ce8b6c" dependencies = [ "proc-macro2", "quote", @@ -190,9 +190,9 @@ dependencies = [ [[package]] name = "chalk-ir" -version = "0.51.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b14b40a09687aa5f0973721841d83a8a0e12a6b3ada1d2e01f0a694bb800ee" +checksum = "a522f53af971e7678f472d687e053120157b3ae26e2ebd5ecbc0f5ab124f2cb6" dependencies = [ "bitflags", "chalk-derive", @@ -201,9 +201,9 @@ dependencies = [ [[package]] name = "chalk-recursive" -version = "0.51.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c7297bb1683f63a4b334b53cfdd81a721e8adde3441514e1126d24aaafe2552" +checksum = "8b0a6bc94f16aaba1dd6d1e2350945bbb0239c3633cdabeedbed601c1354d4b4" dependencies = [ "chalk-derive", "chalk-ir", @@ -214,9 +214,9 @@ dependencies = [ [[package]] name = "chalk-solve" -version = "0.51.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82765c1a19e801d53fc9d145449701ddf79f394e6519f1e9c01fca1ee95d0ba7" +checksum = "cdf79fb77a567e456a170f7ec84ea6584163d4ba3f13660cd182013d34ca667c" dependencies = [ "chalk-derive", "chalk-ir", diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml index c7502bf5741..f6bf495465a 100644 --- a/crates/hir_ty/Cargo.toml +++ b/crates/hir_ty/Cargo.toml @@ -17,9 +17,9 @@ ena = "0.14.0" log = "0.4.8" rustc-hash = "1.1.0" scoped-tls = "1" -chalk-solve = { version = "0.51", default-features = false } -chalk-ir = "0.51" -chalk-recursive = "0.51" +chalk-solve = { version = "0.55", default-features = false } +chalk-ir = "0.55" +chalk-recursive = "0.55" la-arena = { version = "0.2.0", path = "../../lib/arena" } stdx = { path = "../stdx", version = "0.0.0" } diff --git a/crates/hir_ty/src/traits/chalk.rs b/crates/hir_ty/src/traits/chalk.rs index cfb756158c0..d74c837370a 100644 --- a/crates/hir_ty/src/traits/chalk.rs +++ b/crates/hir_ty/src/traits/chalk.rs @@ -675,7 +675,7 @@ pub(crate) fn fn_def_variance_query( ) -> Variances { let callable_def: CallableDefId = from_chalk(db, fn_def_id); let generic_params = generics(db.upcast(), callable_def.into()); - Variances::from( + Variances::from_iter( &Interner, std::iter::repeat(chalk_ir::Variance::Invariant).take(generic_params.len()), ) @@ -688,7 +688,7 @@ pub(crate) fn adt_variance_query( ) -> Variances { let adt: crate::AdtId = from_chalk(db, adt_id); let generic_params = generics(db.upcast(), adt.into()); - Variances::from( + Variances::from_iter( &Interner, std::iter::repeat(chalk_ir::Variance::Invariant).take(generic_params.len()), ) |