Make core_arch compatible with Rust2015 and Rust2018

Author: gnzlbg

.travis.yml

@@ -96,16 +96,6 @@ matrix:
 install: travis_retry rustup target add $TARGET
 script:
   - cargo generate-lockfile
-  - sed 's@2015@2018@g' crates/core_arch/Cargo.toml > crates/core_arch/Cargo2018.toml
-  - sed 's@2015@2018@g' crates/std_detect/Cargo.toml > crates/std_detect/Cargo2018.toml
-  - mv crates/core_arch/Cargo.toml crates/core_arch/Cargo.toml.bak
-  - mv crates/std_detect/Cargo.toml crates/std_detect/Cargo.toml.bak
-  - mv crates/core_arch/Cargo2018.toml crates/core_arch/Cargo.toml
-  - mv crates/std_detect/Cargo2018.toml crates/std_detect/Cargo.toml
-  - cargo build --target="${TARGET}" --manifest-path=crates/core_arch/Cargo.toml
-  - cargo build --target="${TARGET}" --manifest-path=crates/std_detect/Cargo.toml
-  - mv crates/core_arch/Cargo.toml.bak crates/core_arch/Cargo.toml
-  - mv crates/std_detect/Cargo.toml.bak crates/std_detect/Cargo.toml
   - |
     if [ "${NO_DOCKER}" = "1" ]; then
         ci/run.sh $TARGET

ci/run.sh

@@ -88,7 +88,3 @@ if [ "$NORUN" != "1" ] && [ "$NOSTD" != 1 ] && [ "$TARGET" != "wasm32-unknown-un
         echo test | cargo run --release hex
     )
 fi
-
-# Test Rust2018 build
-cargo build --target="${TARGET}" --manifest-path=crates/core_arch/Cargo2018.toml
-cargo build --target="${TARGET}" --manifest-path=crates/std_detect/Cargo2018.toml

crates/core_arch/src/aarch64/crc.rs

@@ -87,8 +87,7 @@ pub unsafe fn __crc32cd(crc: u32, data: u64) -> u32 {
 
 #[cfg(test)]
 mod tests {
-    use core_arch::aarch64::*;
-    use core_arch::simd::*;
+    use crate::core_arch::{aarch64::*, simd::*};
     use std::mem;
     use stdsimd_test::simd_test;
 

crates/core_arch/src/aarch64/crypto.rs

@@ -1,5 +1,4 @@
-use core_arch::arm::uint32x4_t;
-use core_arch::arm::uint8x16_t;
+use crate::core_arch::arm::{uint32x4_t, uint8x16_t};
 
 #[allow(improper_ctypes)]
 extern "C" {
@@ -164,8 +163,7 @@ pub unsafe fn vsha256su1q_u32(
 
 #[cfg(test)]
 mod tests {
-    use core_arch::aarch64::*;
-    use core_arch::simd::*;
+    use crate::core_arch::{aarch64::*, simd::*};
     use std::mem;
     use stdsimd_test::simd_test;
 

crates/core_arch/src/aarch64/mod.rs

@@ -27,5 +27,5 @@ use stdsimd_test::assert_instr;
 #[cfg_attr(test, assert_instr(brk))]
 #[inline]
 pub unsafe fn brk() -> ! {
-    ::intrinsics::abort()
+    crate::intrinsics::abort()
 }