Skip to content

Commit 7a14c3d

Browse files
committed
Auto merge of rust-lang#83776 - jyn514:update-stdarch-docs, r=Amanieu
Update stdarch submodule (to before it switched to const generics) rust-lang#83278 (comment): This unblocks rust-lang#82539. Major changes: - More AVX-512 intrinsics. - More ARM & AArch64 NEON intrinsics. - Updated unstable WASM intrinsics to latest draft standards. - std_detect is now a separate crate instead of a submodule of std. I double-checked and the first use of const generics looks like rust-lang/stdarch@8d50178, which isn't included in this PR. r? `@Amanieu`
2 parents 0d71354 + a7b83bd commit 7a14c3d

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

std/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ compiler_builtins = { version = "0.1.39" }
2121
profiler_builtins = { path = "../profiler_builtins", optional = true }
2222
unwind = { path = "../unwind" }
2323
hashbrown = { version = "0.11", default-features = false, features = ['rustc-dep-of-std'] }
24+
std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = ['rustc-dep-of-std'] }
2425

2526
# Dependencies of the `backtrace` crate
2627
addr2line = { version = "0.14.0", optional = true, default-features = false }
@@ -70,8 +71,8 @@ panic_immediate_abort = ["core/panic_immediate_abort"]
7071

7172
# Enable std_detect default features for stdarch/crates/std_detect:
7273
# https://github.com/rust-lang/stdarch/blob/master/crates/std_detect/Cargo.toml
73-
std_detect_file_io = []
74-
std_detect_dlsym_getauxval = []
74+
std_detect_file_io = ["std_detect/std_detect_file_io"]
75+
std_detect_dlsym_getauxval = ["std_detect/std_detect_dlsym_getauxval"]
7576

7677
[package.metadata.fortanix-sgx]
7778
# Maximum possible number of threads when testing

std/src/lib.rs

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -538,22 +538,16 @@ pub mod rt;
538538
#[allow(dead_code, unused_attributes)]
539539
mod backtrace_rs;
540540

541-
// Pull in the `std_detect` crate directly into libstd. The contents of
542-
// `std_detect` are in a different repository: rust-lang/stdarch.
543-
//
544-
// `std_detect` depends on libstd, but the contents of this module are
545-
// set up in such a way that directly pulling it here works such that the
546-
// crate uses the this crate as its libstd.
547-
#[path = "../../stdarch/crates/std_detect/src/mod.rs"]
548-
#[allow(missing_debug_implementations, missing_docs, dead_code)]
549-
#[unstable(feature = "stdsimd", issue = "48556")]
550-
#[cfg(not(test))]
551-
mod std_detect;
552-
541+
#[stable(feature = "simd_x86", since = "1.27.0")]
542+
pub use std_detect::is_x86_feature_detected;
553543
#[doc(hidden)]
554544
#[unstable(feature = "stdsimd", issue = "48556")]
555-
#[cfg(not(test))]
556-
pub use std_detect::detect;
545+
pub use std_detect::*;
546+
#[unstable(feature = "stdsimd", issue = "48556")]
547+
pub use std_detect::{
548+
is_aarch64_feature_detected, is_arm_feature_detected, is_mips64_feature_detected,
549+
is_mips_feature_detected, is_powerpc64_feature_detected, is_powerpc_feature_detected,
550+
};
557551

558552
// Re-export macros defined in libcore.
559553
#[stable(feature = "rust1", since = "1.0.0")]

stdarch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 9c732a56f67f54d12a0b4fd99993154906c95ea6
1+
Subproject commit 19f5459dd0f89e466b7bcaa0f69ecca90f21a4d1

0 commit comments

Comments
 (0)