From 1a1e6c8e7358df16e87e9d9f9cdcc5c80dfdeca1 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Tue, 20 May 2014 20:24:17 -0700 Subject: [PATCH] std: Move simd to core::simd and reexport. #1457 [breaking-change] --- src/libcore/lib.rs | 3 ++- src/{libstd/unstable => libcore}/simd.rs | 1 + src/libstd/lib.rs | 3 ++- src/libstd/unstable/mod.rs | 1 - src/test/bench/shootout-mandelbrot.rs | 2 +- src/test/compile-fail/simd-binop.rs | 14 +++++++------- src/test/compile-fail/simd-experimental.rs | 2 +- src/test/debuginfo/simd.rs | 2 +- src/test/run-pass/simd-binop.rs | 2 +- src/test/run-pass/simd-issue-10604.rs | 2 +- 10 files changed, 17 insertions(+), 15 deletions(-) rename src/{libstd/unstable => libcore}/simd.rs (98%) diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 0ddd3d8fd56..56cbe2e2a30 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -53,7 +53,7 @@ html_root_url = "http://doc.rust-lang.org/")] #![no_std] -#![feature(globs, macro_rules, managed_boxes, phase)] +#![feature(globs, macro_rules, managed_boxes, phase, simd)] #![deny(missing_doc)] #[cfg(test)] extern crate realcore = "core"; @@ -124,6 +124,7 @@ pub mod option; pub mod raw; pub mod result; +pub mod simd; pub mod slice; pub mod str; pub mod tuple; diff --git a/src/libstd/unstable/simd.rs b/src/libcore/simd.rs similarity index 98% rename from src/libstd/unstable/simd.rs rename to src/libcore/simd.rs index a7a314d35e7..c0825c3fc29 100644 --- a/src/libstd/unstable/simd.rs +++ b/src/libcore/simd.rs @@ -11,6 +11,7 @@ //! SIMD vectors #![allow(non_camel_case_types)] +#![allow(missing_doc)] #[experimental] #[simd] diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 8a7d3f39472..bb6f93cf087 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -103,7 +103,7 @@ html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://doc.rust-lang.org/")] #![feature(macro_rules, globs, asm, managed_boxes, thread_local, link_args, - simd, linkage, default_type_params, phase, concat_idents, quad_precision_float)] + linkage, default_type_params, phase, concat_idents, quad_precision_float)] // Don't link to std. We are std. #![no_std] @@ -151,6 +151,7 @@ #[cfg(not(test))] pub use core::ops; pub use core::ptr; pub use core::raw; +pub use core::simd; pub use core::tuple; #[cfg(not(test))] pub use core::ty; pub use core::result; diff --git a/src/libstd/unstable/mod.rs b/src/libstd/unstable/mod.rs index b235ec4d8c8..2e27f4d4488 100644 --- a/src/libstd/unstable/mod.rs +++ b/src/libstd/unstable/mod.rs @@ -14,7 +14,6 @@ pub mod dynamic_lib; -pub mod simd; pub mod sync; pub mod mutex; diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout-mandelbrot.rs index 6b3079b8fc8..70abebd321a 100644 --- a/src/test/bench/shootout-mandelbrot.rs +++ b/src/test/bench/shootout-mandelbrot.rs @@ -17,7 +17,7 @@ use std::io; use std::os; -use std::unstable::simd::f64x2; +use std::simd::f64x2; use sync::Future; use sync::Arc; diff --git a/src/test/compile-fail/simd-binop.rs b/src/test/compile-fail/simd-binop.rs index 281e879592d..9fbb7364054 100644 --- a/src/test/compile-fail/simd-binop.rs +++ b/src/test/compile-fail/simd-binop.rs @@ -12,26 +12,26 @@ #![allow(experimental)] -use std::unstable::simd::f32x4; +use std::simd::f32x4; fn main() { let _ = f32x4(0.0, 0.0, 0.0, 0.0) == f32x4(0.0, 0.0, 0.0, 0.0); - //~^ ERROR binary comparison operation `==` not supported for floating point SIMD vector `std::unstable::simd::f32x4` + //~^ ERROR binary comparison operation `==` not supported for floating point SIMD vector `core::simd::f32x4` let _ = f32x4(0.0, 0.0, 0.0, 0.0) != f32x4(0.0, 0.0, 0.0, 0.0); - //~^ ERROR binary comparison operation `!=` not supported for floating point SIMD vector `std::unstable::simd::f32x4` + //~^ ERROR binary comparison operation `!=` not supported for floating point SIMD vector `core::simd::f32x4` let _ = f32x4(0.0, 0.0, 0.0, 0.0) < f32x4(0.0, 0.0, 0.0, 0.0); - //~^ ERROR binary comparison operation `<` not supported for floating point SIMD vector `std::unstable::simd::f32x4` + //~^ ERROR binary comparison operation `<` not supported for floating point SIMD vector `core::simd::f32x4` let _ = f32x4(0.0, 0.0, 0.0, 0.0) <= f32x4(0.0, 0.0, 0.0, 0.0); - //~^ ERROR binary comparison operation `<=` not supported for floating point SIMD vector `std::unstable::simd::f32x4` + //~^ ERROR binary comparison operation `<=` not supported for floating point SIMD vector `core::simd::f32x4` let _ = f32x4(0.0, 0.0, 0.0, 0.0) >= f32x4(0.0, 0.0, 0.0, 0.0); - //~^ ERROR binary comparison operation `>=` not supported for floating point SIMD vector `std::unstable::simd::f32x4` + //~^ ERROR binary comparison operation `>=` not supported for floating point SIMD vector `core::simd::f32x4` let _ = f32x4(0.0, 0.0, 0.0, 0.0) > f32x4(0.0, 0.0, 0.0, 0.0); - //~^ ERROR binary comparison operation `>` not supported for floating point SIMD vector `std::unstable::simd::f32x4` + //~^ ERROR binary comparison operation `>` not supported for floating point SIMD vector `core::simd::f32x4` } diff --git a/src/test/compile-fail/simd-experimental.rs b/src/test/compile-fail/simd-experimental.rs index f9cc4d0d8c3..5f9f56bf3c0 100644 --- a/src/test/compile-fail/simd-experimental.rs +++ b/src/test/compile-fail/simd-experimental.rs @@ -10,7 +10,7 @@ #![deny(experimental)] -use std::unstable::simd; +use std::simd; fn main() { let _ = simd::i64x2(0, 0); //~ ERROR: experimental diff --git a/src/test/debuginfo/simd.rs b/src/test/debuginfo/simd.rs index ff9618aa1f1..b84405ee727 100644 --- a/src/test/debuginfo/simd.rs +++ b/src/test/debuginfo/simd.rs @@ -43,7 +43,7 @@ #![allow(experimental)] #![allow(unused_variable)] -use std::unstable::simd::{i8x16, i16x8,i32x4,i64x2,u8x16,u16x8,u32x4,u64x2,f32x4,f64x2}; +use std::simd::{i8x16, i16x8,i32x4,i64x2,u8x16,u16x8,u32x4,u64x2,f32x4,f64x2}; fn main() { diff --git a/src/test/run-pass/simd-binop.rs b/src/test/run-pass/simd-binop.rs index efcd99a04ce..7f9be78d583 100644 --- a/src/test/run-pass/simd-binop.rs +++ b/src/test/run-pass/simd-binop.rs @@ -10,7 +10,7 @@ #![allow(experimental)] -use std::unstable::simd::{i32x4, f32x4, u32x4}; +use std::simd::{i32x4, f32x4, u32x4}; fn eq_u32x4(u32x4(x0, x1, x2, x3): u32x4, u32x4(y0, y1, y2, y3): u32x4) -> bool { (x0 == y0) && (x1 == y1) && (x2 == y2) && (x3 == y3) diff --git a/src/test/run-pass/simd-issue-10604.rs b/src/test/run-pass/simd-issue-10604.rs index 2e533e3b263..966db25a128 100644 --- a/src/test/run-pass/simd-issue-10604.rs +++ b/src/test/run-pass/simd-issue-10604.rs @@ -13,5 +13,5 @@ #![feature(simd)] pub fn main() { - let _o = None::; + let _o = None::; } -- 2.44.0