Skip to content

Commit 3979e15

Browse files
authored
Rollup merge of #94790 - RalfJung:portable-simd-miri, r=Dylan-DPC
enable portable-simd doctests in Miri With rust-lang/miri#2013 we shouldn't need to disable these tests any more. :)
2 parents b18b2d1 + 29d979f commit 3979e15

File tree

3 files changed

+0
-7
lines changed

3 files changed

+0
-7
lines changed

library/core/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -412,12 +412,10 @@ pub mod arch {
412412
#[allow(missing_debug_implementations, dead_code, unsafe_op_in_unsafe_fn, unused_unsafe)]
413413
#[allow(rustdoc::bare_urls)]
414414
#[unstable(feature = "portable_simd", issue = "86656")]
415-
#[cfg(not(all(miri, doctest)))] // Skip SIMD doctests in Miri
416415
mod core_simd;
417416

418417
#[doc = include_str!("../../portable-simd/crates/core_simd/src/core_simd_docs.md")]
419418
#[unstable(feature = "portable_simd", issue = "86656")]
420-
#[cfg(not(all(miri, doctest)))] // Skip SIMD doctests in Miri
421419
pub mod simd {
422420
#[unstable(feature = "portable_simd", issue = "86656")]
423421
pub use crate::core_simd::simd::*;

library/core/src/slice/mod.rs

-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use crate::option::Option::{None, Some};
1616
use crate::ptr;
1717
use crate::result::Result;
1818
use crate::result::Result::{Err, Ok};
19-
#[cfg(not(all(miri, doctest)))] // Miri skips SIMD doctests
2019
use crate::simd::{self, Simd};
2120
use crate::slice;
2221

@@ -3544,7 +3543,6 @@ impl<T> [T] {
35443543
/// assert_eq!(basic_simd_sum(&numbers[1..99]), 4949.0);
35453544
/// ```
35463545
#[unstable(feature = "portable_simd", issue = "86656")]
3547-
#[cfg(not(all(miri, doctest)))] // Miri skips SIMD doctests
35483546
pub fn as_simd<const LANES: usize>(&self) -> (&[T], &[Simd<T, LANES>], &[T])
35493547
where
35503548
Simd<T, LANES>: AsRef<[T; LANES]>,
@@ -3588,7 +3586,6 @@ impl<T> [T] {
35883586
/// be lifted in a way that would make it possible to see panics from this
35893587
/// method for something like `LANES == 3`.
35903588
#[unstable(feature = "portable_simd", issue = "86656")]
3591-
#[cfg(not(all(miri, doctest)))] // Miri skips SIMD doctests
35923589
pub fn as_simd_mut<const LANES: usize>(&mut self) -> (&mut [T], &mut [Simd<T, LANES>], &mut [T])
35933590
where
35943591
Simd<T, LANES>: AsMut<[T; LANES]>,

library/std/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -501,10 +501,8 @@ pub mod lazy;
501501
#[allow(missing_debug_implementations, dead_code, unsafe_op_in_unsafe_fn, unused_unsafe)]
502502
#[allow(rustdoc::bare_urls)]
503503
#[unstable(feature = "portable_simd", issue = "86656")]
504-
#[cfg(not(all(miri, doctest)))] // Miri does not support all SIMD intrinsics
505504
mod std_float;
506505

507-
#[cfg(not(all(miri, doctest)))] // Miri does not support all SIMD intrinsics
508506
#[doc = include_str!("../../portable-simd/crates/core_simd/src/core_simd_docs.md")]
509507
#[unstable(feature = "portable_simd", issue = "86656")]
510508
pub mod simd {

0 commit comments

Comments
 (0)