From e43ec03968f72c654214a9cd64253140a2f5ffc8 Mon Sep 17 00:00:00 2001 From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:03:36 +0200 Subject: [PATCH] Update chalk --- Cargo.lock | 20 ++++++++++---------- compiler/rustc_middle/Cargo.toml | 2 +- compiler/rustc_traits/Cargo.toml | 6 +++--- compiler/rustc_traits/src/chalk/db.rs | 2 ++ 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b78004c93df..25051600d42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -414,21 +414,21 @@ dependencies = [ [[package]] name = "chalk-derive" -version = "0.87.0" +version = "0.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d552b2fa341f5fc35c6b917b1d289d3c3a34d0b74e579390ea6192d6152a8cdb" +checksum = "ff5053a8a42dbff5279a82423946fc56dc1253b76cf211b2b3c14b3aad4e1281" dependencies = [ "proc-macro2", "quote", - "syn 1.0.102", - "synstructure 0.12.6", + "syn 2.0.8", + "synstructure 0.13.0", ] [[package]] name = "chalk-engine" -version = "0.87.0" +version = "0.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e54ac43048cb31c470d7b3e3acd409090ef4a5abddfe02455187aebc3d6879f" +checksum = "b9d0e18f29b8b0f4dcf7d31fe00c884af67719699e381e8dcc9d9624b1621c60" dependencies = [ "chalk-derive", "chalk-ir", @@ -439,9 +439,9 @@ dependencies = [ [[package]] name = "chalk-ir" -version = "0.87.0" +version = "0.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43aa55deff4e7fbdb09fa014543372f2c95a06835ac487b9ce57b5099b950838" +checksum = "8a56de2146a8ed0fcd54f4bd50db852f1de4eac9e1efe568494f106c21b77d2a" dependencies = [ "bitflags", "chalk-derive", @@ -450,9 +450,9 @@ dependencies = [ [[package]] name = "chalk-solve" -version = "0.87.0" +version = "0.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61213deefc36ba265ad01c4d997e18bcddf7922862a4594a47ca4575afb3dab4" +checksum = "b392e02b4c81ec76d3748da839fc70a5539b83d27c9030668463d34d5110b860" dependencies = [ "chalk-derive", "chalk-ir", diff --git a/compiler/rustc_middle/Cargo.toml b/compiler/rustc_middle/Cargo.toml index 7c56af1da41..07ab3ba4e8a 100644 --- a/compiler/rustc_middle/Cargo.toml +++ b/compiler/rustc_middle/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] bitflags = "1.2.1" -chalk-ir = "0.87.0" +chalk-ir = "0.92.0" derive_more = "0.99.17" either = "1.5.0" gsgdt = "0.1.2" diff --git a/compiler/rustc_traits/Cargo.toml b/compiler/rustc_traits/Cargo.toml index dfd6fbff7c9..189f72d478e 100644 --- a/compiler/rustc_traits/Cargo.toml +++ b/compiler/rustc_traits/Cargo.toml @@ -11,9 +11,9 @@ rustc_hir = { path = "../rustc_hir" } rustc_ast = { path = "../rustc_ast" } rustc_span = { path = "../rustc_span" } rustc_target = { path = "../rustc_target" } -chalk-ir = "0.87.0" -chalk-engine = "0.87.0" -chalk-solve = "0.87.0" +chalk-ir = "0.92.0" +chalk-engine = "0.92.0" +chalk-solve = "0.92.0" smallvec = { version = "1.8.1", features = ["union", "may_dangle"] } rustc_infer = { path = "../rustc_infer" } rustc_trait_selection = { path = "../rustc_trait_selection" } diff --git a/compiler/rustc_traits/src/chalk/db.rs b/compiler/rustc_traits/src/chalk/db.rs index 6948151c644..0435cd63e80 100644 --- a/compiler/rustc_traits/src/chalk/db.rs +++ b/compiler/rustc_traits/src/chalk/db.rs @@ -572,6 +572,8 @@ impl<'tcx> chalk_solve::RustIrDatabase> for RustIrDatabase<'t DiscriminantKind => lang_items.discriminant_kind_trait(), DispatchFromDyn => lang_items.dispatch_from_dyn_trait(), Tuple => lang_items.tuple_trait(), + Pointee => lang_items.pointee_trait(), + FnPtr => lang_items.fn_ptr_trait(), }; def_id.map(chalk_ir::TraitId) }