From 0de10a962e410a8a3664d84ec7f505f443fda8d0 Mon Sep 17 00:00:00 2001 From: teor Date: Mon, 13 Jul 2026 14:03:17 +1000 Subject: [PATCH 1/3] Update library to rustc-demangle 1.2.8 --- Cargo.lock | 4 ++-- crates/stdarch-test/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cf6ce0d38e..58901b3c1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -678,9 +678,9 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "rustc-demangle" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d" +checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb" [[package]] name = "rustix" diff --git a/crates/stdarch-test/Cargo.toml b/crates/stdarch-test/Cargo.toml index eddd3b7f78..2f3d294e12 100644 --- a/crates/stdarch-test/Cargo.toml +++ b/crates/stdarch-test/Cargo.toml @@ -7,7 +7,7 @@ edition = "2024" [dependencies] assert-instr-macro = { path = "../assert-instr-macro" } simd-test-macro = { path = "../simd-test-macro" } -rustc-demangle = "0.1.8" +rustc-demangle = "0.1.28" [target.'cfg(windows)'.dependencies] cc = "1.0" From b43d28f95d478b5ddba4ca77facee980c413407c Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Sun, 5 Jul 2026 16:55:05 -0400 Subject: [PATCH 2/3] replace-version-placeholder --- .../src/arm_shared/neon/generated.rs | 32 +++++++++---------- crates/core_arch/src/loongarch64/mod.rs | 16 +++++----- .../spec/neon/arm_shared.spec.yml | 8 ++--- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/crates/core_arch/src/arm_shared/neon/generated.rs b/crates/core_arch/src/arm_shared/neon/generated.rs index 7c0c7985da..b3715308c9 100644 --- a/crates/core_arch/src/arm_shared/neon/generated.rs +++ b/crates/core_arch/src/arm_shared/neon/generated.rs @@ -9597,7 +9597,7 @@ pub fn vcvtq_u32_f32(a: float32x4_t) -> uint32x4_t { #[rustc_legacy_const_generics(3)] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", @@ -9622,7 +9622,7 @@ pub fn vdot_lane_s32(a: int32x2_t, b: int8x8_t, c: int8x8_t) -> #[rustc_legacy_const_generics(3)] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", @@ -9647,7 +9647,7 @@ pub fn vdotq_lane_s32(a: int32x4_t, b: int8x16_t, c: int8x8_t) #[rustc_legacy_const_generics(3)] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", @@ -9672,7 +9672,7 @@ pub fn vdot_lane_u32(a: uint32x2_t, b: uint8x8_t, c: uint8x8_t) #[rustc_legacy_const_generics(3)] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", @@ -9697,7 +9697,7 @@ pub fn vdotq_lane_u32(a: uint32x4_t, b: uint8x16_t, c: uint8x8_ #[rustc_legacy_const_generics(3)] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", @@ -9722,7 +9722,7 @@ pub fn vdot_laneq_s32(a: int32x2_t, b: int8x8_t, c: int8x16_t) #[rustc_legacy_const_generics(3)] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", @@ -9747,7 +9747,7 @@ pub fn vdotq_laneq_s32(a: int32x4_t, b: int8x16_t, c: int8x16_t #[rustc_legacy_const_generics(3)] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", @@ -9772,7 +9772,7 @@ pub fn vdot_laneq_u32(a: uint32x2_t, b: uint8x8_t, c: uint8x16_ #[rustc_legacy_const_generics(3)] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", @@ -9797,7 +9797,7 @@ pub fn vdotq_laneq_u32(a: uint32x4_t, b: uint8x16_t, c: uint8x1 )] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", @@ -9827,7 +9827,7 @@ pub fn vdot_s32(a: int32x2_t, b: int8x8_t, c: int8x8_t) -> int32x2_t { )] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", @@ -9863,7 +9863,7 @@ pub fn vdot_s32(a: int32x2_t, b: int8x8_t, c: int8x8_t) -> int32x2_t { )] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", @@ -9893,7 +9893,7 @@ pub fn vdotq_s32(a: int32x4_t, b: int8x16_t, c: int8x16_t) -> int32x4_t { )] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", @@ -9931,7 +9931,7 @@ pub fn vdotq_s32(a: int32x4_t, b: int8x16_t, c: int8x16_t) -> int32x4_t { )] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", @@ -9961,7 +9961,7 @@ pub fn vdot_u32(a: uint32x2_t, b: uint8x8_t, c: uint8x8_t) -> uint32x2_t { )] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", @@ -9997,7 +9997,7 @@ pub fn vdot_u32(a: uint32x2_t, b: uint8x8_t, c: uint8x8_t) -> uint32x2_t { )] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", @@ -10027,7 +10027,7 @@ pub fn vdotq_u32(a: uint32x4_t, b: uint8x16_t, c: uint8x16_t) -> uint32x4_t { )] #[cfg_attr( not(target_arch = "arm"), - stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION") + stable(feature = "stdarch_neon_dotprod", since = "1.98.0") )] #[cfg_attr( target_arch = "arm", diff --git a/crates/core_arch/src/loongarch64/mod.rs b/crates/core_arch/src/loongarch64/mod.rs index ffaa4225ba..44c8f1d28e 100644 --- a/crates/core_arch/src/loongarch64/mod.rs +++ b/crates/core_arch/src/loongarch64/mod.rs @@ -62,56 +62,56 @@ unsafe extern "unadjusted" { /// Calculate the CRC value using the IEEE 802.3 polynomial (0xEDB88320) #[inline(always)] -#[stable(feature = "stdarch_loongarch_crc", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "stdarch_loongarch_crc", since = "1.98.0")] pub fn crc_w_b_w(a: i8, b: i32) -> i32 { unsafe { __crc_w_b_w(a as i32, b) } } /// Calculate the CRC value using the IEEE 802.3 polynomial (0xEDB88320) #[inline(always)] -#[stable(feature = "stdarch_loongarch_crc", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "stdarch_loongarch_crc", since = "1.98.0")] pub fn crc_w_h_w(a: i16, b: i32) -> i32 { unsafe { __crc_w_h_w(a as i32, b) } } /// Calculate the CRC value using the IEEE 802.3 polynomial (0xEDB88320) #[inline(always)] -#[stable(feature = "stdarch_loongarch_crc", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "stdarch_loongarch_crc", since = "1.98.0")] pub fn crc_w_w_w(a: i32, b: i32) -> i32 { unsafe { __crc_w_w_w(a, b) } } /// Calculate the CRC value using the IEEE 802.3 polynomial (0xEDB88320) #[inline(always)] -#[stable(feature = "stdarch_loongarch_crc", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "stdarch_loongarch_crc", since = "1.98.0")] pub fn crc_w_d_w(a: i64, b: i32) -> i32 { unsafe { __crc_w_d_w(a, b) } } /// Calculate the CRC value using the Castagnoli polynomial (0x82F63B78) #[inline(always)] -#[stable(feature = "stdarch_loongarch_crc", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "stdarch_loongarch_crc", since = "1.98.0")] pub fn crcc_w_b_w(a: i8, b: i32) -> i32 { unsafe { __crcc_w_b_w(a as i32, b) } } /// Calculate the CRC value using the Castagnoli polynomial (0x82F63B78) #[inline(always)] -#[stable(feature = "stdarch_loongarch_crc", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "stdarch_loongarch_crc", since = "1.98.0")] pub fn crcc_w_h_w(a: i16, b: i32) -> i32 { unsafe { __crcc_w_h_w(a as i32, b) } } /// Calculate the CRC value using the Castagnoli polynomial (0x82F63B78) #[inline(always)] -#[stable(feature = "stdarch_loongarch_crc", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "stdarch_loongarch_crc", since = "1.98.0")] pub fn crcc_w_w_w(a: i32, b: i32) -> i32 { unsafe { __crcc_w_w_w(a, b) } } /// Calculate the CRC value using the Castagnoli polynomial (0x82F63B78) #[inline(always)] -#[stable(feature = "stdarch_loongarch_crc", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "stdarch_loongarch_crc", since = "1.98.0")] pub fn crcc_w_d_w(a: i64, b: i32) -> i32 { unsafe { __crcc_w_d_w(a, b) } } diff --git a/crates/stdarch-gen-arm/spec/neon/arm_shared.spec.yml b/crates/stdarch-gen-arm/spec/neon/arm_shared.spec.yml index 12055cc4bc..7473742a96 100644 --- a/crates/stdarch-gen-arm/spec/neon/arm_shared.spec.yml +++ b/crates/stdarch-gen-arm/spec/neon/arm_shared.spec.yml @@ -14,9 +14,9 @@ neon-stable: &neon-stable neon-stable-fp16: &neon-stable-fp16 FnCall: [stable, ['feature = "stdarch_neon_fp16"', 'since = "1.94.0"']] -# #[stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION")] +# #[stable(feature = "stdarch_neon_dotprod", since = "1.98.0")] neon-stable-dotprod: &neon-stable-dotprod - FnCall: [stable, ['feature = "stdarch_neon_dotprod"', 'since = "CURRENT_RUSTC_VERSION"']] + FnCall: [stable, ['feature = "stdarch_neon_dotprod"', 'since = "1.98.0"']] # #[cfg_attr(target_arch = "arm", unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800"))] neon-cfg-arm-unstable: &neon-cfg-arm-unstable @@ -63,9 +63,9 @@ neon-not-arm-stable: &neon-not-arm-stable neon-not-arm-stable-fp16: &neon-not-arm-stable-fp16 FnCall: [cfg_attr, [{ FnCall: [not, ['target_arch = "arm"']]}, {FnCall: [stable, ['feature = "stdarch_neon_fp16"', 'since = "1.94.0"']]}]] -# #[cfg_attr(not(target_arch = "arm"), stable(feature = "stdarch_neon_dotprod", since = "CURRENT_RUSTC_VERSION"))] +# #[cfg_attr(not(target_arch = "arm"), stable(feature = "stdarch_neon_dotprod", since = "1.98.0"))] neon-not-arm-stable-dotprod: &neon-not-arm-stable-dotprod - FnCall: [cfg_attr, [{ FnCall: [not, ['target_arch = "arm"']]}, {FnCall: [stable, ['feature = "stdarch_neon_dotprod"', 'since = "CURRENT_RUSTC_VERSION"']]}]] + FnCall: [cfg_attr, [{ FnCall: [not, ['target_arch = "arm"']]}, {FnCall: [stable, ['feature = "stdarch_neon_dotprod"', 'since = "1.98.0"']]}]] # #[cfg_attr(all(test, not(target_env = "msvc"))] msvc-disabled: &msvc-disabled From ec292866b1b960afc6b68681e497f8e0b1dff02a Mon Sep 17 00:00:00 2001 From: The rustc-josh-sync Cronjob Bot Date: Thu, 16 Jul 2026 05:04:26 +0000 Subject: [PATCH 3/3] Prepare for merging from rust-lang/rust This updates the rust-version file to fcbe7917ba18120d9eda136f1c7c5a60c78e554e. --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index e8cec4e0ee..7b240b9797 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -8e150217bafcaaaa0c45bf685c55fd56cec48598 +fcbe7917ba18120d9eda136f1c7c5a60c78e554e