diff options
| author | Ralf Jung <post@ralfj.de> | 2022-03-03 15:11:06 -0500 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2022-03-03 15:11:06 -0500 |
| commit | 50e7450bac9fd9faafb7adb7540ab07ddea896d1 (patch) | |
| tree | c26abe06e0cf1594ec70e69a63d87ed752d964a5 | |
| parent | e9149b6773c396e18534425ccb1d3ae5b974793f (diff) | |
| download | rust-50e7450bac9fd9faafb7adb7540ab07ddea896d1.tar.gz rust-50e7450bac9fd9faafb7adb7540ab07ddea896d1.zip | |
only disable SIMD for doctests in Miri (not for the stdlib build itself)
| -rw-r--r-- | library/core/src/lib.rs | 4 | ||||
| -rw-r--r-- | library/core/src/slice/mod.rs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs index e7896b2cb66..45fbcf44b35 100644 --- a/library/core/src/lib.rs +++ b/library/core/src/lib.rs @@ -408,12 +408,12 @@ pub mod arch { #[allow(missing_debug_implementations, dead_code, unsafe_op_in_unsafe_fn, unused_unsafe)] #[allow(rustdoc::bare_urls)] #[unstable(feature = "portable_simd", issue = "86656")] -#[cfg(not(all(miri, doctest)))] // Miri does not support all SIMD intrinsics +#[cfg(not(all(miri, doctest)))] // Skip SIMD doctests in Miri mod core_simd; #[doc = include_str!("../../portable-simd/crates/core_simd/src/core_simd_docs.md")] #[unstable(feature = "portable_simd", issue = "86656")] -#[cfg(not(all(miri, doctest)))] // Miri does not support all SIMD intrinsics +#[cfg(not(all(miri, doctest)))] // Skip SIMD doctests in Miri pub mod simd { #[unstable(feature = "portable_simd", issue = "86656")] pub use crate::core_simd::simd::*; diff --git a/library/core/src/slice/mod.rs b/library/core/src/slice/mod.rs index 08b95d791a3..9467c7f54ba 100644 --- a/library/core/src/slice/mod.rs +++ b/library/core/src/slice/mod.rs @@ -16,7 +16,7 @@ use crate::option::Option::{None, Some}; use crate::ptr; use crate::result::Result; use crate::result::Result::{Err, Ok}; -#[cfg(not(miri))] // Miri does not support all SIMD intrinsics +#[cfg(not(all(miri, doctest)))] // Miri skips SIMD doctests use crate::simd::{self, Simd}; use crate::slice; @@ -3540,7 +3540,7 @@ impl<T> [T] { /// assert_eq!(basic_simd_sum(&numbers[1..99]), 4949.0); /// ``` #[unstable(feature = "portable_simd", issue = "86656")] - #[cfg(not(miri))] // Miri does not support all SIMD intrinsics + #[cfg(not(all(miri, doctest)))] // Miri skips SIMD doctests pub fn as_simd<const LANES: usize>(&self) -> (&[T], &[Simd<T, LANES>], &[T]) where Simd<T, LANES>: AsRef<[T; LANES]>, @@ -3584,7 +3584,7 @@ impl<T> [T] { /// be lifted in a way that would make it possible to see panics from this /// method for something like `LANES == 3`. #[unstable(feature = "portable_simd", issue = "86656")] - #[cfg(not(miri))] // Miri does not support all SIMD intrinsics + #[cfg(not(all(miri, doctest)))] // Miri skips SIMD doctests pub fn as_simd_mut<const LANES: usize>(&mut self) -> (&mut [T], &mut [Simd<T, LANES>], &mut [T]) where Simd<T, LANES>: AsMut<[T; LANES]>, |
