Enable edition=2018 for core_arch

Author: gnzlbg

crates/core_arch/Cargo.toml

@@ -15,7 +15,7 @@ keywords = ["core", "simd", "arch", "intrinsics"]
 categories = ["hardware-support", "no-std"]
 license = "MIT/Apache-2.0"
 build = "build.rs"
-edition = "2015"
+edition = "2018"
 
 [badges]
 travis-ci = { repository = "rust-lang-nursery/stdsimd" }

crates/core_arch/src/acle/simd32.rs

@@ -65,8 +65,8 @@
 #[cfg(test)]
 use stdsimd_test::assert_instr;
 
+use crate::core_arch::acle::dsp::int16x2_t;
 use crate::mem::transmute;
-use core_arch::acle::dsp::int16x2_t;
 
 types! {
     /// ARM-specific 32-bit wide vector of four packed `i8`.

crates/core_arch/src/lib.rs

@@ -65,8 +65,6 @@ extern crate std;
 extern crate std_detect;
 #[cfg(test)]
 extern crate stdsimd_test;
-#[cfg(test)]
-extern crate test;
 
 #[cfg(all(test, target_arch = "wasm32"))]
 extern crate wasm_bindgen_test;
@@ -78,3 +76,6 @@ pub use self::core_arch::arch::*;
 
 #[allow(unused_imports)]
 use core::{ffi, intrinsics, marker, mem, ptr, sync};
+
+#[cfg(test)]
+use core::hint;

crates/core_arch/src/x86/avx.rs

@@ -3308,8 +3308,8 @@ extern "C" {
 
 #[cfg(test)]
 mod tests {
-    use stdsimd_test::simd_test;
-    use test::black_box; // Used to inhibit constant-folding.
+    use crate::hint::black_box;
+    use stdsimd_test::simd_test; // Used to inhibit constant-folding.
 
     use crate::core_arch::x86::*;
 

crates/core_arch/src/x86/sha.rs

@@ -136,8 +136,8 @@ mod tests {
     use std::mem::{self, transmute};
 
     use crate::core_arch::{simd::*, x86::*};
-    use stdsimd_test::simd_test;
-    use test::black_box; // Used to inhibit constant-folding.
+    use crate::hint::black_box;
+    use stdsimd_test::simd_test; // Used to inhibit constant-folding.
 
     #[simd_test(enable = "sha")]
     #[allow(overflowing_literals)]

crates/core_arch/src/x86/sse.rs

@@ -2497,10 +2497,10 @@ pub unsafe fn _mm_cvtps_pi8(a: __m128) -> __m64 {
 
 #[cfg(test)]
 mod tests {
+    use crate::hint::black_box;
     use crate::mem::transmute;
     use std::f32::NAN;
-    use stdsimd_test::simd_test;
-    use test::black_box; // Used to inhibit constant-folding.
+    use stdsimd_test::simd_test; // Used to inhibit constant-folding.
 
     use crate::core_arch::{simd::*, x86::*};
 

crates/core_arch/src/x86/sse2.rs

@@ -3189,8 +3189,8 @@ mod tests {
     use std::mem::{self, transmute};
 
     use crate::core_arch::{simd::*, x86::*};
-    use stdsimd_test::simd_test;
-    use test::black_box; // Used to inhibit constant-folding.
+    use crate::hint::black_box;
+    use stdsimd_test::simd_test; // Used to inhibit constant-folding.
 
     #[test]
     fn test_mm_pause() {