diff options
| author | bors <bors@rust-lang.org> | 2018-07-21 06:26:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-21 06:26:18 +0000 |
| commit | 17eb392cefdcf4b98c47f9ab36742e66a314932f (patch) | |
| tree | 0aa8fbc1e01bd210dae51937f55aabc492b5ba86 | |
| parent | f8f6e7c04d1331574589df298e8651e7104fe2ff (diff) | |
| parent | d77defcca114c14e6bbedc24697ead76a249a567 (diff) | |
| download | rust-17eb392cefdcf4b98c47f9ab36742e66a314932f.tar.gz rust-17eb392cefdcf4b98c47f9ab36742e66a314932f.zip | |
Auto merge of #52535 - alexcrichton:update-stdsimd, r=Mark-Simulacrum
Update stdsimd to undo an accidental stabilization Closes #52403
| -rw-r--r-- | src/libcore/lib.rs | 3 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 4 | ||||
| m--------- | src/stdsimd | 0 | ||||
| -rw-r--r-- | src/test/rustdoc-js/multi-query.js | 1 |
4 files changed, 0 insertions, 8 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index bbe6ae8619f..72074e1dbce 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -244,9 +244,6 @@ macro_rules! vector_impl { ($([$f:ident, $($args:tt)*]),*) => { $($f!($($args)*) #[cfg(not(stage0))] // allow changes to how stdsimd works in stage0 mod coresimd; -#[unstable(feature = "stdsimd", issue = "48556")] -#[cfg(not(stage0))] -pub use coresimd::simd; #[stable(feature = "simd_arch", since = "1.27.0")] #[cfg(not(stage0))] pub use coresimd::arch; diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index fec14b8d67d..3c01de2e997 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -532,12 +532,8 @@ mod stdsimd; #[cfg(not(stage0))] mod coresimd { pub use core::arch; - pub use core::simd; } -#[unstable(feature = "stdsimd", issue = "48556")] -#[cfg(all(not(stage0), not(test)))] -pub use stdsimd::simd; #[stable(feature = "simd_arch", since = "1.27.0")] #[cfg(all(not(stage0), not(test)))] pub use stdsimd::arch; diff --git a/src/stdsimd b/src/stdsimd -Subproject 886ff388fbbe8798e292431d824a5ff3c3458f4 +Subproject b9de11ab43090c71ff7ab159a479394df1f968a diff --git a/src/test/rustdoc-js/multi-query.js b/src/test/rustdoc-js/multi-query.js index 3793ca6599c..3f583a3600a 100644 --- a/src/test/rustdoc-js/multi-query.js +++ b/src/test/rustdoc-js/multi-query.js @@ -15,6 +15,5 @@ const EXPECTED = { { 'path': 'std', 'name': 'str' }, { 'path': 'std', 'name': 'u8' }, { 'path': 'std::ffi', 'name': 'CStr' }, - { 'path': 'std::simd', 'name': 'u8x2' }, ], }; |