Skip to content

Commit 645ab61

Browse files
calebzulawskicalebzulawski
authored
Merge pull request #317 from rust-lang/fix-exports
Remove reexport of simd::*
2 parents 6e30c6e + db8b23c commit 645ab61

File tree

11 files changed

+47
-45
lines changed

11 files changed

+47
-45
lines changed

‎crates/core_simd/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,3 @@
2121
#[path = "mod.rs"]
2222
mod core_simd;
2323
pub use self::core_simd::simd;
24-
pub use simd::*;

‎crates/core_simd/tests/autoderef.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Test that we handle all our "auto-deref" cases correctly.
22
#![feature(portable_simd)]
3-
use core_simd::f32x4;
3+
use core_simd::simd::f32x4;
44

55
#[cfg(target_arch = "wasm32")]
66
use wasm_bindgen_test::*;

‎crates/core_simd/tests/mask_ops_impl/mask_macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ macro_rules! mask_tests {
22
{ $vector:ident, $lanes:literal } => {
33
#[cfg(test)]
44
mod $vector {
5-
use core_simd::$vector as Vector;
5+
use core_simd::simd::$vector as Vector;
66
const LANES: usize = $lanes;
77

88
#[cfg(target_arch = "wasm32")]

‎crates/core_simd/tests/masks.rs

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ macro_rules! test_mask_api {
1313
#[cfg(target_arch = "wasm32")]
1414
use wasm_bindgen_test::*;
1515

16+
use core_simd::simd::Mask;
17+
1618
#[test]
1719
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
1820
fn set_and_test() {
1921
let values = [true, false, false, true, false, false, true, false];
20-
let mut mask = core_simd::Mask::<$type, 8>::splat(false);
22+
let mut mask = Mask::<$type, 8>::splat(false);
2123
for (lane, value) in values.iter().copied().enumerate() {
2224
mask.set(lane, value);
2325
}
@@ -29,90 +31,90 @@ macro_rules! test_mask_api {
2931
#[test]
3032
#[should_panic]
3133
fn set_invalid_lane() {
32-
let mut mask = core_simd::Mask::<$type, 8>::splat(false);
34+
let mut mask = Mask::<$type, 8>::splat(false);
3335
mask.set(8, true);
3436
let _ = mask;
3537
}
3638

3739
#[test]
3840
#[should_panic]
3941
fn test_invalid_lane() {
40-
let mask = core_simd::Mask::<$type, 8>::splat(false);
42+
let mask = Mask::<$type, 8>::splat(false);
4143
let _ = mask.test(8);
4244
}
4345

4446
#[test]
4547
fn any() {
46-
assert!(!core_simd::Mask::<$type, 8>::splat(false).any());
47-
assert!(core_simd::Mask::<$type, 8>::splat(true).any());
48-
let mut v = core_simd::Mask::<$type, 8>::splat(false);
48+
assert!(!Mask::<$type, 8>::splat(false).any());
49+
assert!(Mask::<$type, 8>::splat(true).any());
50+
let mut v = Mask::<$type, 8>::splat(false);
4951
v.set(2, true);
5052
assert!(v.any());
5153
}
5254

5355
#[test]
5456
fn all() {
55-
assert!(!core_simd::Mask::<$type, 8>::splat(false).all());
56-
assert!(core_simd::Mask::<$type, 8>::splat(true).all());
57-
let mut v = core_simd::Mask::<$type, 8>::splat(false);
57+
assert!(!Mask::<$type, 8>::splat(false).all());
58+
assert!(Mask::<$type, 8>::splat(true).all());
59+
let mut v = Mask::<$type, 8>::splat(false);
5860
v.set(2, true);
5961
assert!(!v.all());
6062
}
6163

6264
#[test]
6365
fn roundtrip_int_conversion() {
6466
let values = [true, false, false, true, false, false, true, false];
65-
let mask = core_simd::Mask::<$type, 8>::from_array(values);
67+
let mask = Mask::<$type, 8>::from_array(values);
6668
let int = mask.to_int();
6769
assert_eq!(int.to_array(), [-1, 0, 0, -1, 0, 0, -1, 0]);
68-
assert_eq!(core_simd::Mask::<$type, 8>::from_int(int), mask);
70+
assert_eq!(Mask::<$type, 8>::from_int(int), mask);
6971
}
7072

7173
#[test]
7274
fn roundtrip_bitmask_conversion() {
73-
use core_simd::ToBitMask;
75+
use core_simd::simd::ToBitMask;
7476
let values = [
7577
true, false, false, true, false, false, true, false,
7678
true, true, false, false, false, false, false, true,
7779
];
78-
let mask = core_simd::Mask::<$type, 16>::from_array(values);
80+
let mask = Mask::<$type, 16>::from_array(values);
7981
let bitmask = mask.to_bitmask();
8082
assert_eq!(bitmask, 0b1000001101001001);
81-
assert_eq!(core_simd::Mask::<$type, 16>::from_bitmask(bitmask), mask);
83+
assert_eq!(Mask::<$type, 16>::from_bitmask(bitmask), mask);
8284
}
8385

8486
#[test]
8587
fn roundtrip_bitmask_conversion_short() {
86-
use core_simd::ToBitMask;
88+
use core_simd::simd::ToBitMask;
8789

8890
let values = [
8991
false, false, false, true,
9092
];
91-
let mask = core_simd::Mask::<$type, 4>::from_array(values);
93+
let mask = Mask::<$type, 4>::from_array(values);
9294
let bitmask = mask.to_bitmask();
9395
assert_eq!(bitmask, 0b1000);
94-
assert_eq!(core_simd::Mask::<$type, 4>::from_bitmask(bitmask), mask);
96+
assert_eq!(Mask::<$type, 4>::from_bitmask(bitmask), mask);
9597

9698
let values = [true, false];
97-
let mask = core_simd::Mask::<$type, 2>::from_array(values);
99+
let mask = Mask::<$type, 2>::from_array(values);
98100
let bitmask = mask.to_bitmask();
99101
assert_eq!(bitmask, 0b01);
100-
assert_eq!(core_simd::Mask::<$type, 2>::from_bitmask(bitmask), mask);
102+
assert_eq!(Mask::<$type, 2>::from_bitmask(bitmask), mask);
101103
}
102104

103105
#[test]
104106
fn cast() {
105-
fn cast_impl<T: core_simd::MaskElement>()
107+
fn cast_impl<T: core_simd::simd::MaskElement>()
106108
where
107-
core_simd::Mask<$type, 8>: Into<core_simd::Mask<T, 8>>,
109+
Mask<$type, 8>: Into<Mask<T, 8>>,
108110
{
109111
let values = [true, false, false, true, false, false, true, false];
110-
let mask = core_simd::Mask::<$type, 8>::from_array(values);
112+
let mask = Mask::<$type, 8>::from_array(values);
111113

112114
let cast_mask = mask.cast::<T>();
113115
assert_eq!(values, cast_mask.to_array());
114116

115-
let into_mask: core_simd::Mask<T, 8> = mask.into();
117+
let into_mask: Mask<T, 8> = mask.into();
116118
assert_eq!(values, into_mask.to_array());
117119
}
118120

@@ -126,15 +128,15 @@ macro_rules! test_mask_api {
126128
#[cfg(feature = "generic_const_exprs")]
127129
#[test]
128130
fn roundtrip_bitmask_array_conversion() {
129-
use core_simd::ToBitMaskArray;
131+
use core_simd::simd::ToBitMaskArray;
130132
let values = [
131133
true, false, false, true, false, false, true, false,
132134
true, true, false, false, false, false, false, true,
133135
];
134-
let mask = core_simd::Mask::<$type, 16>::from_array(values);
136+
let mask = Mask::<$type, 16>::from_array(values);
135137
let bitmask = mask.to_bitmask_array();
136138
assert_eq!(bitmask, [0b01001001, 0b10000011]);
137-
assert_eq!(core_simd::Mask::<$type, 16>::from_bitmask_array(bitmask), mask);
139+
assert_eq!(Mask::<$type, 16>::from_bitmask_array(bitmask), mask);
138140
}
139141
}
140142
}
@@ -150,9 +152,10 @@ mod mask_api {
150152

151153
#[test]
152154
fn convert() {
155+
use core_simd::simd::Mask;
153156
let values = [true, false, false, true, false, false, true, false];
154157
assert_eq!(
155-
core_simd::Mask::<i8, 8>::from_array(values),
156-
core_simd::Mask::<i32, 8>::from_array(values).into()
158+
Mask::<i8, 8>::from_array(values),
159+
Mask::<i32, 8>::from_array(values).into()
157160
);
158161
}

‎crates/core_simd/tests/ops_macros.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ macro_rules! impl_unary_op_test {
77
test_helpers::test_lanes! {
88
fn $fn<const LANES: usize>() {
99
test_helpers::test_unary_elementwise(
10-
&<core_simd::Simd<$scalar, LANES> as core::ops::$trait>::$fn,
10+
&<core_simd::simd::Simd<$scalar, LANES> as core::ops::$trait>::$fn,
1111
&$scalar_fn,
1212
&|_| true,
1313
);
@@ -27,7 +27,7 @@ macro_rules! impl_binary_op_test {
2727
{ $scalar:ty, $trait:ident :: $fn:ident, $trait_assign:ident :: $fn_assign:ident, $scalar_fn:expr } => {
2828
mod $fn {
2929
use super::*;
30-
use core_simd::Simd;
30+
use core_simd::simd::Simd;
3131

3232
test_helpers::test_lanes! {
3333
fn normal<const LANES: usize>() {
@@ -64,7 +64,7 @@ macro_rules! impl_binary_checked_op_test {
6464
{ $scalar:ty, $trait:ident :: $fn:ident, $trait_assign:ident :: $fn_assign:ident, $scalar_fn:expr, $check_fn:expr } => {
6565
mod $fn {
6666
use super::*;
67-
use core_simd::Simd;
67+
use core_simd::simd::Simd;
6868

6969
test_helpers::test_lanes! {
7070
fn normal<const LANES: usize>() {
@@ -173,7 +173,7 @@ macro_rules! impl_signed_tests {
173173
{ $scalar:tt } => {
174174
mod $scalar {
175175
use core_simd::simd::SimdInt;
176-
type Vector<const LANES: usize> = core_simd::Simd<Scalar, LANES>;
176+
type Vector<const LANES: usize> = core_simd::simd::Simd<Scalar, LANES>;
177177
type Scalar = $scalar;
178178

179179
impl_common_integer_tests! { Vector, Scalar }
@@ -314,7 +314,7 @@ macro_rules! impl_unsigned_tests {
314314
{ $scalar:tt } => {
315315
mod $scalar {
316316
use core_simd::simd::SimdUint;
317-
type Vector<const LANES: usize> = core_simd::Simd<Scalar, LANES>;
317+
type Vector<const LANES: usize> = core_simd::simd::Simd<Scalar, LANES>;
318318
type Scalar = $scalar;
319319

320320
impl_common_integer_tests! { Vector, Scalar }
@@ -348,8 +348,8 @@ macro_rules! impl_unsigned_tests {
348348
macro_rules! impl_float_tests {
349349
{ $scalar:tt, $int_scalar:tt } => {
350350
mod $scalar {
351-
use core_simd::SimdFloat;
352-
type Vector<const LANES: usize> = core_simd::Simd<Scalar, LANES>;
351+
use core_simd::simd::SimdFloat;
352+
type Vector<const LANES: usize> = core_simd::simd::Simd<Scalar, LANES>;
353353
type Scalar = $scalar;
354354

355355
impl_unary_op_test!(Scalar, Neg::neg);

‎crates/core_simd/tests/pointers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![feature(portable_simd, strict_provenance)]
22

3-
use core_simd::{Simd, SimdConstPtr, SimdMutPtr};
3+
use core_simd::simd::{Simd, SimdConstPtr, SimdMutPtr};
44

55
macro_rules! common_tests {
66
{ $constness:ident } => {

‎crates/core_simd/tests/round.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ macro_rules! float_rounding_test {
55
mod $scalar {
66
use std_float::StdFloat;
77

8-
type Vector<const LANES: usize> = core_simd::Simd<$scalar, LANES>;
8+
type Vector<const LANES: usize> = core_simd::simd::Simd<$scalar, LANES>;
99
type Scalar = $scalar;
1010
type IntScalar = $int_scalar;
1111

‎crates/core_simd/tests/swizzle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(portable_simd)]
2-
use core_simd::{Simd, Swizzle};
2+
use core_simd::simd::{Simd, Swizzle};
33

44
#[cfg(target_arch = "wasm32")]
55
use wasm_bindgen_test::*;

‎crates/core_simd/tests/to_bytes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#![allow(incomplete_features)]
33
#![cfg(feature = "generic_const_exprs")]
44

5-
use core_simd::Simd;
5+
use core_simd::simd::Simd;
66

77
#[test]
88
fn byte_convert() {

‎crates/core_simd/tests/try_from_slice.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use wasm_bindgen_test::*;
66
#[cfg(target_arch = "wasm32")]
77
wasm_bindgen_test_configure!(run_in_browser);
88

9-
use core_simd::i32x4;
9+
use core_simd::simd::i32x4;
1010

1111
#[test]
1212
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]

0 commit comments

Comments
 (0)