Bump rustc crates again

11 files changed, 50 insertions, 57 deletions

diff --git a/src/tools/rust-analyzer/Cargo.lock b/src/tools/rust-analyzer/Cargo.lock
index 9475391acdb..be21cfd9c24 100644
--- a/src/tools/rust-analyzer/Cargo.lock
+++ b/src/tools/rust-analyzer/Cargo.lock
@@ -1863,9 +1863,9 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_abi"
-version = "0.129.0"
+version = "0.130.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa338fe027a8915009ca4a5a1cb7dde5fb4bc4170a928cb9462fda9d2ec52cec"
+checksum = "dd3df655461690c1554bc0e355f19495eef6cd729dc29f01bd07cb7cd2a0990a"
 dependencies = [
  "bitflags 2.9.1",
  "ra-ap-rustc_hashes",
@@ -1875,24 +1875,24 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_ast_ir"
-version = "0.129.0"
+version = "0.130.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8468ef77e5359b3a51e327406f29ca2283a4feef93d3ba04f6740b274636922"
+checksum = "10f55c57676d67dba036171d23f7941a9c3b884181c5e93d3bd5fa599f8f129b"
 
 [[package]]
 name = "ra-ap-rustc_hashes"
-version = "0.129.0"
+version = "0.130.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300bc3264ccc1e7a5b3f065023a02e612774206d8ad685b3b05c2e4e317f8daa"
+checksum = "feec9ffe50d93b8f17770b49d4cbf46280e074a105c7c9325c8d2171cf395b76"
 dependencies = [
  "rustc-stable-hash",
 ]
 
 [[package]]
 name = "ra-ap-rustc_index"
-version = "0.129.0"
+version = "0.130.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eaa4a3ff61302e45c17ee72e067a39179081c19a12aa03192975a095f5d4e4b"
+checksum = "a73bab902bcdeceac4a9630ed732d19f6b7189cbe8e828a94156a780bd8e1196"
 dependencies = [
  "ra-ap-rustc_index_macros",
  "smallvec",
@@ -1900,9 +1900,9 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_index_macros"
-version = "0.129.0"
+version = "0.130.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f7af0d51ee6bd5280be8e2eb7e9ac5cd9fc87af7a99f50cdb1316a8779c15ab"
+checksum = "88c7906b654b9c4188aee3fde82a7449bac6e156a5d86ad923bae05bd5040690"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1911,9 +1911,9 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_lexer"
-version = "0.129.0"
+version = "0.130.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4e7df9bf702c855de7bea5e3c14b96f0728d4712edb663b0f4b183622341fc"
+checksum = "acec3893f60dca2a37f9e838c08f3f3c8e012ce36194c2b84da96781e794e359"
 dependencies = [
  "memchr",
  "unicode-properties",
@@ -1922,9 +1922,9 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_next_trait_solver"
-version = "0.129.0"
+version = "0.130.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15768080a276088a4a6af1e08a4ca622c57d5b4845ce5329dbbd71a2e025eecb"
+checksum = "c4626e22dc21062bdac1a8340b497365e1983a69cc271d7d052a62348b88bd7f"
 dependencies = [
  "derive-where",
  "ra-ap-rustc_index",
@@ -1935,9 +1935,9 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_parse_format"
-version = "0.129.0"
+version = "0.130.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6f0c54b200c47768eaf142b1c829da9be1a3331a5defa4ac60bad4996f474e9"
+checksum = "47a95720d31edf45a8ccde190c14954425af0d53c9b6d4702fdd905b3951a2e1"
 dependencies = [
  "ra-ap-rustc_lexer",
  "rustc-literal-escaper 0.0.5",
@@ -1945,9 +1945,9 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_pattern_analysis"
-version = "0.129.0"
+version = "0.130.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a078fbbefda17d8d5d2c9d6b5a1f9ee1e23fae5f057e74784f6b95c189b0b048"
+checksum = "0c1ebf6272bf11f0ba3b909e3405f547de32ea19d745b8fef11f1fb643b72fcd"
 dependencies = [
  "ra-ap-rustc_index",
  "rustc-hash 2.1.1",
@@ -1958,9 +1958,9 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_type_ir"
-version = "0.129.0"
+version = "0.130.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "644e980122cdb7f2d7e175f33224dc6df414e8cf3e5dfbba9047e63336d9737a"
+checksum = "a9aa8f1344940e097514403c53bb5a1e4f5c3986da888461bc651373d195090b"
 dependencies = [
  "arrayvec",
  "bitflags 2.9.1",
@@ -1978,9 +1978,9 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_type_ir_macros"
-version = "0.129.0"
+version = "0.130.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "827d242d444cea86d9a64b5ce99db1462c9d43c7c6226d44ec2bc621b7c253c0"
+checksum = "30c65f1a5da2f3c39d72a56687694568abb203b3737a2321090e112da04958b3"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml
index 94ec1a07438..e81c4088122 100644
--- a/src/tools/rust-analyzer/Cargo.toml
+++ b/src/tools/rust-analyzer/Cargo.toml
@@ -89,14 +89,14 @@ vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
 vfs = { path = "./crates/vfs", version = "0.0.0" }
 edition = { path = "./crates/edition", version = "0.0.0" }
 
-ra-ap-rustc_lexer = { version = "0.129", default-features = false }
-ra-ap-rustc_parse_format = { version = "0.129", default-features = false }
-ra-ap-rustc_index = { version = "0.129", default-features = false }
-ra-ap-rustc_abi = { version = "0.129", default-features = false }
-ra-ap-rustc_pattern_analysis = { version = "0.129", default-features = false }
-ra-ap-rustc_ast_ir = { version = "0.129", default-features = false }
-ra-ap-rustc_type_ir = { version = "0.129", default-features = false }
-ra-ap-rustc_next_trait_solver = { version = "0.129", default-features = false }
+ra-ap-rustc_lexer = { version = "0.130", default-features = false }
+ra-ap-rustc_parse_format = { version = "0.130", default-features = false }
+ra-ap-rustc_index = { version = "0.130", default-features = false }
+ra-ap-rustc_abi = { version = "0.130", default-features = false }
+ra-ap-rustc_pattern_analysis = { version = "0.130", default-features = false }
+ra-ap-rustc_ast_ir = { version = "0.130", default-features = false }
+ra-ap-rustc_type_ir = { version = "0.130", default-features = false }
+ra-ap-rustc_next_trait_solver = { version = "0.130", default-features = false }
 
 # local crates that aren't published to crates.io. These should not have versions.
 
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/display.rs b/src/tools/rust-analyzer/crates/hir-ty/src/display.rs
index 0a514f389b4..519e4b59237 100644
--- a/src/tools/rust-analyzer/crates/hir-ty/src/display.rs
+++ b/src/tools/rust-analyzer/crates/hir-ty/src/display.rs
@@ -897,7 +897,7 @@ fn render_const_scalar_inner(
                 }
                 f.write_str("]")
             }
-            TyKind::Dynamic(_, _, _) => {
+            TyKind::Dynamic(_, _) => {
                 let addr = usize::from_le_bytes(b[0..b.len() / 2].try_into().unwrap());
                 let ty_id = usize::from_le_bytes(b[b.len() / 2..].try_into().unwrap());
                 let Ok(t) = memory_map.vtable_ty(ty_id) else {
@@ -1064,7 +1064,7 @@ fn render_const_scalar_inner(
         | TyKind::Bound(_, _)
         | TyKind::Infer(_) => f.write_str("<placeholder-or-unknown-type>"),
         // The below arms are unreachable, since we handled them in ref case.
-        TyKind::Slice(_) | TyKind::Str | TyKind::Dynamic(_, _, _) => f.write_str("<unsized-value>"),
+        TyKind::Slice(_) | TyKind::Str | TyKind::Dynamic(_, _) => f.write_str("<unsized-value>"),
     }
 }
 
@@ -1213,7 +1213,7 @@ impl<'db> HirDisplay for crate::next_solver::Ty<'db> {
                     })
                 };
                 let (preds_to_print, has_impl_fn_pred) = match t.kind() {
-                    TyKind::Dynamic(bounds, region, _) => {
+                    TyKind::Dynamic(bounds, region) => {
                         let render_lifetime = f.render_region(region);
                         (
                             bounds.len() + render_lifetime as usize,
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/infer/coerce.rs b/src/tools/rust-analyzer/crates/hir-ty/src/infer/coerce.rs
index 88b10e87e53..7930d8b0ed6 100644
--- a/src/tools/rust-analyzer/crates/hir-ty/src/infer/coerce.rs
+++ b/src/tools/rust-analyzer/crates/hir-ty/src/infer/coerce.rs
@@ -611,7 +611,7 @@ impl<'a, 'b, 'db> Coerce<'a, 'b, 'db> {
             | TyKind::Slice(_)
             | TyKind::FnDef(_, _)
             | TyKind::FnPtr(_, _)
-            | TyKind::Dynamic(_, _, _)
+            | TyKind::Dynamic(_, _)
             | TyKind::Closure(_, _)
             | TyKind::CoroutineClosure(_, _)
             | TyKind::Coroutine(_, _)
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/lower_nextsolver.rs b/src/tools/rust-analyzer/crates/hir-ty/src/lower_nextsolver.rs
index 2292e5c9941..b8e0599dba2 100644
--- a/src/tools/rust-analyzer/crates/hir-ty/src/lower_nextsolver.rs
+++ b/src/tools/rust-analyzer/crates/hir-ty/src/lower_nextsolver.rs
@@ -790,7 +790,7 @@ impl<'db, 'a> TyLoweringContext<'db, 'a> {
                 },
                 None => Region::new_static(self.interner),
             };
-            Ty::new_dynamic(self.interner, bounds, region, rustc_type_ir::DynKind::Dyn)
+            Ty::new_dynamic(self.interner, bounds, region)
         } else {
             // FIXME: report error
             // (additional non-auto traits, associated type rebound, or no resolved trait)
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/method_resolution.rs b/src/tools/rust-analyzer/crates/hir-ty/src/method_resolution.rs
index a4427517a10..7fa3d31fe5f 100644
--- a/src/tools/rust-analyzer/crates/hir-ty/src/method_resolution.rs
+++ b/src/tools/rust-analyzer/crates/hir-ty/src/method_resolution.rs
@@ -164,7 +164,7 @@ impl TyFingerprint {
                 rustc_ast_ir::Mutability::Not => TyFingerprint::RawPtr(Mutability::Not),
             },
             TyKind::Foreign(def) => TyFingerprint::ForeignType(crate::to_foreign_def_id(def.0)),
-            TyKind::Dynamic(bounds, _, _) => {
+            TyKind::Dynamic(bounds, _) => {
                 let trait_ref = bounds
                     .as_slice()
                     .iter()
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/mir/eval.rs b/src/tools/rust-analyzer/crates/hir-ty/src/mir/eval.rs
index 6f950b8022c..3e658cb93ed 100644
--- a/src/tools/rust-analyzer/crates/hir-ty/src/mir/eval.rs
+++ b/src/tools/rust-analyzer/crates/hir-ty/src/mir/eval.rs
@@ -2446,7 +2446,7 @@ impl<'db> Evaluator<'db> {
             | TyKind::Foreign(_)
             | TyKind::Error(_)
             | TyKind::Placeholder(_)
-            | TyKind::Dynamic(_, _, _)
+            | TyKind::Dynamic(_, _)
             | TyKind::Alias(_, _)
             | TyKind::Bound(_, _)
             | TyKind::Infer(_)
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/fulfill/errors.rs b/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/fulfill/errors.rs
index 6cd9e55acf0..b49fac18c5d 100644
--- a/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/fulfill/errors.rs
+++ b/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/fulfill/errors.rs
@@ -1146,7 +1146,7 @@ mod wf {
                 }
                 TyKind::UnsafeBinder(ty) => {}
 
-                TyKind::Dynamic(data, r, _) => {
+                TyKind::Dynamic(data, r) => {
                     // WfObject
                     //
                     // Here, we defer WF checking due to higher-ranked
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/mapping.rs b/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/mapping.rs
index d8a86ea083e..b24b996b092 100644
--- a/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/mapping.rs
+++ b/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/mapping.rs
@@ -370,8 +370,7 @@ impl<'db> ChalkToNextSolver<'db, Ty<'db>> for chalk_ir::Ty<Interner> {
                         }),
                     );
                     let region = dyn_ty.lifetime.to_nextsolver(interner);
-                    let kind = rustc_type_ir::DynKind::Dyn;
-                    rustc_type_ir::TyKind::Dynamic(bounds, region, kind)
+                    rustc_type_ir::TyKind::Dynamic(bounds, region)
                 }
                 chalk_ir::TyKind::Alias(alias_ty) => match alias_ty {
                     chalk_ir::AliasTy::Projection(projection_ty) => {
@@ -1445,8 +1444,7 @@ pub(crate) fn convert_ty_for_result<'db>(interner: DbInterner<'db>, ty: Ty<'db>)
             TyKind::Function(fnptr)
         }
 
-        rustc_type_ir::TyKind::Dynamic(preds, region, dyn_kind) => {
-            assert!(matches!(dyn_kind, rustc_type_ir::DynKind::Dyn));
+        rustc_type_ir::TyKind::Dynamic(preds, region) => {
             let self_ty = Ty::new_bound(
                 interner,
                 DebruijnIndex::from_u32(1),
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/ty.rs b/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/ty.rs
index e6c444d0d6b..70139e86669 100644
--- a/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/ty.rs
+++ b/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/ty.rs
@@ -178,7 +178,7 @@ impl<'db> Ty<'db> {
             | TyKind::Never
             | TyKind::Error(_) => true,
 
-            TyKind::Str | TyKind::Slice(_) | TyKind::Dynamic(_, _, _) => match sizedness {
+            TyKind::Str | TyKind::Slice(_) | TyKind::Dynamic(_, _) => match sizedness {
                 SizedTraitKind::Sized => false,
                 SizedTraitKind::MetaSized => true,
             },
@@ -421,7 +421,7 @@ impl<'db> TypeSuperVisitable<DbInterner<'db>> for Ty<'db> {
             }
             TyKind::Slice(typ) => typ.visit_with(visitor),
             TyKind::Adt(_, args) => args.visit_with(visitor),
-            TyKind::Dynamic(ref trait_ty, ref reg, _) => {
+            TyKind::Dynamic(ref trait_ty, ref reg) => {
                 try_visit!(trait_ty.visit_with(visitor));
                 reg.visit_with(visitor)
             }
@@ -486,11 +486,9 @@ impl<'db> TypeSuperFoldable<DbInterner<'db>> for Ty<'db> {
             }
             TyKind::Slice(typ) => TyKind::Slice(typ.try_fold_with(folder)?),
             TyKind::Adt(tid, args) => TyKind::Adt(tid, args.try_fold_with(folder)?),
-            TyKind::Dynamic(trait_ty, region, representation) => TyKind::Dynamic(
-                trait_ty.try_fold_with(folder)?,
-                region.try_fold_with(folder)?,
-                representation,
-            ),
+            TyKind::Dynamic(trait_ty, region) => {
+                TyKind::Dynamic(trait_ty.try_fold_with(folder)?, region.try_fold_with(folder)?)
+            }
             TyKind::Tuple(ts) => TyKind::Tuple(ts.try_fold_with(folder)?),
             TyKind::FnDef(def_id, args) => TyKind::FnDef(def_id, args.try_fold_with(folder)?),
             TyKind::FnPtr(sig_tys, hdr) => TyKind::FnPtr(sig_tys.try_fold_with(folder)?, hdr),
@@ -537,11 +535,9 @@ impl<'db> TypeSuperFoldable<DbInterner<'db>> for Ty<'db> {
             TyKind::Array(typ, sz) => TyKind::Array(typ.fold_with(folder), sz.fold_with(folder)),
             TyKind::Slice(typ) => TyKind::Slice(typ.fold_with(folder)),
             TyKind::Adt(tid, args) => TyKind::Adt(tid, args.fold_with(folder)),
-            TyKind::Dynamic(trait_ty, region, representation) => TyKind::Dynamic(
-                trait_ty.fold_with(folder),
-                region.fold_with(folder),
-                representation,
-            ),
+            TyKind::Dynamic(trait_ty, region) => {
+                TyKind::Dynamic(trait_ty.fold_with(folder), region.fold_with(folder))
+            }
             TyKind::Tuple(ts) => TyKind::Tuple(ts.fold_with(folder)),
             TyKind::FnDef(def_id, args) => TyKind::FnDef(def_id, args.fold_with(folder)),
             TyKind::FnPtr(sig_tys, hdr) => TyKind::FnPtr(sig_tys.fold_with(folder), hdr),
@@ -676,9 +672,8 @@ impl<'db> rustc_type_ir::inherent::Ty<DbInterner<'db>> for Ty<'db> {
         interner: DbInterner<'db>,
         preds: <DbInterner<'db> as rustc_type_ir::Interner>::BoundExistentialPredicates,
         region: <DbInterner<'db> as rustc_type_ir::Interner>::Region,
-        kind: rustc_type_ir::DynKind,
     ) -> Self {
-        Ty::new(interner, TyKind::Dynamic(preds, region, kind))
+        Ty::new(interner, TyKind::Dynamic(preds, region))
     }
 
     fn new_coroutine(
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/util.rs b/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/util.rs
index a50f20a565e..a7f9817f9c0 100644
--- a/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/util.rs
+++ b/src/tools/rust-analyzer/crates/hir-ty/src/next_solver/util.rs
@@ -461,7 +461,7 @@ pub fn sizedness_constraint_for_ty<'db>(
         | CoroutineWitness(..) | Never => None,
 
         // these are never sized
-        Str | Slice(..) | Dynamic(_, _, rustc_type_ir::DynKind::Dyn) => match sizedness {
+        Str | Slice(..) | Dynamic(_, _) => match sizedness {
             // Never `Sized`
             SizedTraitKind::Sized => Some(ty),
             // Always `MetaSized`