Skip to content

Commit 322e4a1

Browse files
committed
stabilize stdarch_s390x_feature_detection
1 parent 3fb3d29 commit 322e4a1

File tree

7 files changed

+4
-14
lines changed

7 files changed

+4
-14
lines changed

library/std/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ pub mod arch {
678678
pub use std_detect::is_loongarch_feature_detected;
679679
#[unstable(feature = "is_riscv_feature_detected", issue = "111192")]
680680
pub use std_detect::is_riscv_feature_detected;
681-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
681+
#[stable(feature = "stdarch_s390x_feature_detection", since = "CURRENT_RUSTC_VERSION")]
682682
pub use std_detect::is_s390x_feature_detected;
683683
#[stable(feature = "simd_x86", since = "1.27.0")]
684684
pub use std_detect::is_x86_feature_detected;

library/std/tests/run-time-detect.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
all(target_arch = "aarch64", any(target_os = "linux", target_os = "android")),
99
feature(stdarch_aarch64_feature_detection)
1010
)]
11-
#![cfg_attr(
12-
all(target_arch = "s390x", target_os = "linux"),
13-
feature(stdarch_s390x_feature_detection)
14-
)]
1511
#![cfg_attr(
1612
all(target_arch = "powerpc", target_os = "linux"),
1713
feature(stdarch_powerpc_feature_detection)

library/std_detect/src/detect/arch/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ cfg_select! {
6060
pub use loongarch::*;
6161
}
6262
target_arch = "s390x" => {
63-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
63+
#[stable(feature = "stdarch_s390x_feature_detection", since = "CURRENT_RUSTC_VERSION")]
6464
pub use s390x::*;
6565
}
6666
_ => {

library/std_detect/src/detect/arch/s390x.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ features! {
66
@MACRO_NAME: is_s390x_feature_detected;
77
@MACRO_ATTRS:
88
/// Checks if `s390x` feature is enabled.
9-
#[unstable(feature = "stdarch_s390x_feature_detection", issue = "135413")]
9+
#[stable(feature = "stdarch_s390x_feature_detection", since = "CURRENT_RUSTC_VERSION")]
1010
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] concurrent_functions: "concurrent-functions";
1111
/// s390x concurrent-functions facility
1212
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] deflate_conversion: "deflate-conversion";

library/std_detect/tests/cpu-detection.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
)]
1212
#![cfg_attr(target_arch = "powerpc", feature(stdarch_powerpc_feature_detection))]
1313
#![cfg_attr(target_arch = "powerpc64", feature(stdarch_powerpc_feature_detection))]
14-
#![cfg_attr(target_arch = "s390x", feature(stdarch_s390x_feature_detection))]
1514
#![allow(clippy::unwrap_used, clippy::use_debug, clippy::print_stdout)]
1615

1716
#[cfg_attr(

library/std_detect/tests/macro_trailing_commas.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
any(target_arch = "powerpc", target_arch = "powerpc64"),
2626
feature(stdarch_powerpc_feature_detection)
2727
)]
28-
#![cfg_attr(target_arch = "s390x", feature(stdarch_s390x_feature_detection))]
2928
#![cfg_attr(
3029
any(target_arch = "riscv32", target_arch = "riscv64"),
3130
feature(stdarch_riscv_feature_detection)

library/stdarch/crates/core_arch/src/lib.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,7 @@
6363
)]
6464
#![cfg_attr(
6565
test,
66-
feature(
67-
stdarch_arm_feature_detection,
68-
stdarch_powerpc_feature_detection,
69-
stdarch_s390x_feature_detection
70-
)
66+
feature(stdarch_arm_feature_detection, stdarch_powerpc_feature_detection,)
7167
)]
7268

7369
#[cfg(test)]

0 commit comments

Comments
 (0)