Skip to content

Commit 439efc1

Browse files
Remove portable_simd
Stand-in for a backport of "Sync portable-simd to remove autosplats #91484".
1 parent e9bb599 commit 439efc1

9 files changed

+0
-131
lines changed

library/core/src/lib.rs

-23
Original file line numberDiff line numberDiff line change
@@ -398,27 +398,4 @@ pub mod arch {
398398
}
399399
}
400400

401-
// Pull in the `core_simd` crate directly into libcore. The contents of
402-
// `core_simd` are in a different repository: rust-lang/portable-simd.
403-
//
404-
// `core_simd` depends on libcore, but the contents of this module are
405-
// set up in such a way that directly pulling it here works such that the
406-
// crate uses this crate as its libcore.
407-
#[path = "../../portable-simd/crates/core_simd/src/mod.rs"]
408-
#[allow(missing_debug_implementations, dead_code, unsafe_op_in_unsafe_fn, unused_unsafe)]
409-
#[allow(rustdoc::bare_urls)]
410-
#[unstable(feature = "portable_simd", issue = "86656")]
411-
#[cfg(not(all(miri, doctest)))] // Miri does not support all SIMD intrinsics
412-
#[cfg(not(bootstrap))]
413-
mod core_simd;
414-
415-
#[doc = include_str!("../../portable-simd/crates/core_simd/src/core_simd_docs.md")]
416-
#[unstable(feature = "portable_simd", issue = "86656")]
417-
#[cfg(not(all(miri, doctest)))] // Miri does not support all SIMD intrinsics
418-
#[cfg(not(bootstrap))]
419-
pub mod simd {
420-
#[unstable(feature = "portable_simd", issue = "86656")]
421-
pub use crate::core_simd::simd::*;
422-
}
423-
424401
include!("primitive_docs.rs");

library/core/tests/lib.rs

-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
#![feature(never_type)]
6262
#![feature(unwrap_infallible)]
6363
#![feature(result_into_ok_or_err)]
64-
#![cfg_attr(not(bootstrap), feature(portable_simd))]
6564
#![feature(ptr_metadata)]
6665
#![feature(once_cell)]
6766
#![feature(unsized_tuple_coercion)]
@@ -107,8 +106,6 @@ mod pattern;
107106
mod pin;
108107
mod ptr;
109108
mod result;
110-
#[cfg(not(bootstrap))]
111-
mod simd;
112109
mod slice;
113110
mod str;
114111
mod str_lossy;

library/core/tests/simd.rs

-15
This file was deleted.

library/std/src/lib.rs

-4
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,6 @@
323323
#![feature(panic_internals)]
324324
#![feature(panic_unwind)]
325325
#![feature(pin_static_ref)]
326-
#![cfg_attr(not(bootstrap), feature(portable_simd))]
327326
#![feature(prelude_import)]
328327
#![feature(ptr_internals)]
329328
#![feature(rustc_attrs)]
@@ -475,9 +474,6 @@ pub use core::pin;
475474
pub use core::ptr;
476475
#[stable(feature = "rust1", since = "1.0.0")]
477476
pub use core::result;
478-
#[unstable(feature = "portable_simd", issue = "86656")]
479-
#[cfg(not(bootstrap))]
480-
pub use core::simd;
481477
#[unstable(feature = "async_stream", issue = "79024")]
482478
pub use core::stream;
483479
#[stable(feature = "i128", since = "1.26.0")]

src/test/ui/simd/libm_no_std_cant_float.rs

-21
This file was deleted.

src/test/ui/simd/libm_no_std_cant_float.stderr

-39
This file was deleted.

src/test/ui/simd/portable-intrinsics-arent-exposed.rs

-8
This file was deleted.

src/test/ui/simd/portable-intrinsics-arent-exposed.stderr

-15
This file was deleted.

src/test/ui/suggestions/issue-71394-no-from-impl.stderr

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ error[E0277]: the trait bound `&[i8]: From<&[u8]>` is not satisfied
44
LL | let _: &[i8] = data.into();
55
| ^^^^ the trait `From<&[u8]>` is not implemented for `&[i8]`
66
|
7-
= help: the following implementations were found:
8-
<[T; LANES] as From<Simd<T, LANES>>>
9-
<[bool; LANES] as From<Mask<T, LANES>>>
107
= note: required because of the requirements on the impl of `Into<&[i8]>` for `&[u8]`
118

129
error: aborting due to previous error

0 commit comments

Comments
 (0)