Skip to content

Commit

Permalink
std: Move simd to core::simd and reexport. rust-lang#1457
Browse files Browse the repository at this point in the history
[breaking-change]
  • Loading branch information
brson committed May 23, 2014
1 parent dcd20e2 commit 473a545
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 15 deletions.
3 changes: 2 additions & 1 deletion src/libcore/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -124,6 +124,7 @@ pub mod iter;
pub mod option;
pub mod raw;
pub mod result;
pub mod simd;
pub mod slice;
pub mod str;
pub mod tuple;
Expand Down
1 change: 1 addition & 0 deletions src/libstd/unstable/simd.rs → src/libcore/simd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
//! SIMD vectors
#![allow(non_camel_case_types)]
#![allow(missing_doc)]

#[experimental]
#[simd]
Expand Down
3 changes: 2 additions & 1 deletion src/libstd/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,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]
Expand Down Expand Up @@ -152,6 +152,7 @@ pub use core::mem;
#[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;
Expand Down
1 change: 0 additions & 1 deletion src/libstd/unstable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ pub use core::finally;

pub mod dynamic_lib;

pub mod simd;
pub mod sync;
pub mod mutex;

2 changes: 1 addition & 1 deletion src/test/bench/shootout-mandelbrot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ extern crate sync;

use std::io;
use std::os;
use std::unstable::simd::f64x2;
use std::simd::f64x2;
use sync::Future;
use sync::Arc;

Expand Down
14 changes: 7 additions & 7 deletions src/test/compile-fail/simd-binop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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`

}
2 changes: 1 addition & 1 deletion src/test/compile-fail/simd-experimental.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#![deny(experimental)]

use std::unstable::simd;
use std::simd;

fn main() {
let _ = simd::i64x2(0, 0); //~ ERROR: experimental
Expand Down
2 changes: 1 addition & 1 deletion src/test/debuginfo/simd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {

Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/simd-binop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/simd-issue-10604.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
#![feature(simd)]

pub fn main() {
let _o = None::<std::unstable::simd::i32x4>;
let _o = None::<std::simd::i32x4>;
}

0 comments on commit 473a545

Please sign in to comment.