diff options
| author | bors <bors@rust-lang.org> | 2021-04-12 18:29:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-12 18:29:25 +0000 |
| commit | d0695c9081b16077d0aed368bccaf437d77ff497 (patch) | |
| tree | e502b113ff2c7ff88e2f5f29b23eace25b85886c /library/std/src | |
| parent | 1284da34da56a17ae368e4673920ec4120562cbd (diff) | |
| parent | 1b0b7e95be5f0da032ddd35226792ca469c21684 (diff) | |
| download | rust-d0695c9081b16077d0aed368bccaf437d77ff497.tar.gz rust-d0695c9081b16077d0aed368bccaf437d77ff497.zip | |
Auto merge of #83776 - jyn514:update-stdarch-docs, r=Amanieu
Update stdarch submodule (to before it switched to const generics) https://github.com/rust-lang/rust/pull/83278#issuecomment-812389823: This unblocks #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 https://github.com/rust-lang/stdarch/commit/8d5017861ed594a2baf169e632379862d516e013, which isn't included in this PR. r? `@Amanieu`
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/lib.rs | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 91695ced6a9..18ad2077d83 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -538,22 +538,16 @@ pub mod rt; #[allow(dead_code, unused_attributes)] mod backtrace_rs; -// Pull in the `std_detect` crate directly into libstd. The contents of -// `std_detect` are in a different repository: rust-lang/stdarch. -// -// `std_detect` depends on libstd, but the contents of this module are -// set up in such a way that directly pulling it here works such that the -// crate uses the this crate as its libstd. -#[path = "../../stdarch/crates/std_detect/src/mod.rs"] -#[allow(missing_debug_implementations, missing_docs, dead_code)] -#[unstable(feature = "stdsimd", issue = "48556")] -#[cfg(not(test))] -mod std_detect; - +#[stable(feature = "simd_x86", since = "1.27.0")] +pub use std_detect::is_x86_feature_detected; #[doc(hidden)] #[unstable(feature = "stdsimd", issue = "48556")] -#[cfg(not(test))] -pub use std_detect::detect; +pub use std_detect::*; +#[unstable(feature = "stdsimd", issue = "48556")] +pub use std_detect::{ + is_aarch64_feature_detected, is_arm_feature_detected, is_mips64_feature_detected, + is_mips_feature_detected, is_powerpc64_feature_detected, is_powerpc_feature_detected, +}; // Re-export macros defined in libcore. #[stable(feature = "rust1", since = "1.0.0")] |