Skip to content

Commit 902bfb8

Browse files
committed
Update feature names for new stdarch
1 parent 8af5a72 commit 902bfb8

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

core/src/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,6 @@ pub mod primitive;
429429
deprecated_in_future
430430
)]
431431
#[allow(rustdoc::bare_urls)]
432-
// FIXME: This annotation should be moved into rust-lang/stdarch after clashing_extern_declarations is
433-
// merged. It currently cannot because bootstrap fails as the lint hasn't been defined yet.
434-
#[allow(clashing_extern_declarations)]
435-
#[unstable(feature = "stdsimd", issue = "48556")]
436432
mod core_arch;
437433

438434
#[stable(feature = "simd_arch", since = "1.27.0")]

std/src/lib.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,6 @@
385385
#![feature(get_many_mut)]
386386
#![feature(lazy_cell)]
387387
#![feature(log_syntax)]
388-
#![feature(stdsimd)]
389388
#![feature(test)]
390389
#![feature(trace_macros)]
391390
// tidy-alphabetical-end
@@ -624,13 +623,16 @@ pub mod arch {
624623

625624
#[stable(feature = "simd_aarch64", since = "1.60.0")]
626625
pub use std_detect::is_aarch64_feature_detected;
626+
#[unstable(feature = "stdarch_arm_feature_detection", issue = "111190")]
627+
pub use std_detect::is_arm_feature_detected;
628+
#[unstable(feature = "is_riscv_feature_detected", issue = "111192")]
629+
pub use std_detect::is_riscv_feature_detected;
627630
#[stable(feature = "simd_x86", since = "1.27.0")]
628631
pub use std_detect::is_x86_feature_detected;
629-
#[unstable(feature = "stdsimd", issue = "48556")]
630-
pub use std_detect::{
631-
is_arm_feature_detected, is_mips64_feature_detected, is_mips_feature_detected,
632-
is_powerpc64_feature_detected, is_powerpc_feature_detected, is_riscv_feature_detected,
633-
};
632+
#[unstable(feature = "stdarch_mips_feature_detection", issue = "111188")]
633+
pub use std_detect::{is_mips64_feature_detected, is_mips_feature_detected};
634+
#[unstable(feature = "stdarch_powerpc_feature_detection", issue = "111191")]
635+
pub use std_detect::{is_powerpc64_feature_detected, is_powerpc_feature_detected};
634636
}
635637

636638
// This was stabilized in the crate root so we have to keep it there.

std/tests/run-time-detect.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
//! These tests just check that the macros are available in std.
22
33
#![cfg_attr(
4-
any(
5-
all(target_arch = "arm", any(target_os = "linux", target_os = "android")),
6-
all(target_arch = "powerpc", target_os = "linux"),
7-
all(target_arch = "powerpc64", target_os = "linux"),
8-
),
9-
feature(stdsimd)
4+
all(target_arch = "arm", any(target_os = "linux", target_os = "android")),
5+
feature(stdarch_arm_feature_detection)
6+
)]
7+
#![cfg_attr(
8+
all(target_arch = "powerpc", target_os = "linux"),
9+
feature(stdarch_powerpc_feature_detection)
10+
)]
11+
#![cfg_attr(
12+
all(target_arch = "powerpc64", target_os = "linux"),
13+
feature(stdarch_powerpc_feature_detection)
1014
)]
1115

1216
#[test]

0 commit comments

Comments
 (0)