Shuffle around stdsimd::arch::detect bits (#428)

Compile more code on more platforms, tweak imports, try to catch mistakes
sooner.

Author: alexcrichton

crates/stdsimd/src/lib.rs

@@ -18,7 +18,7 @@
 extern crate cfg_if;
 extern crate coresimd;
 extern crate libc;
-extern crate std as _std;
+extern crate std as __do_not_use_this_import;
 
 #[cfg(test)]
 #[macro_use(println, print)]
@@ -30,8 +30,10 @@ mod stdsimd;
 pub use stdsimd::*;
 
 #[allow(unused_imports)]
-use _std::fs;
+use __do_not_use_this_import::fs;
 #[allow(unused_imports)]
-use _std::io;
+use __do_not_use_this_import::io;
 #[allow(unused_imports)]
-use _std::prelude;
+use __do_not_use_this_import::prelude;
+#[allow(unused_imports)]
+use __do_not_use_this_import::mem;

stdsimd/arch/detect/os/bit.rs renamed to stdsimd/arch/detect/bit.rs

@@ -56,6 +56,9 @@ cfg_if! {
 }
 pub use self::arch::Feature;
 
+mod cache;
+mod bit;
+
 cfg_if! {
     if #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] {
         // On x86/x86_64 no OS specific functionality is required.

stdsimd/arch/detect/os/cache.rs renamed to stdsimd/arch/detect/cache.rs

@@ -1,15 +1,10 @@
 //! Run-time feature detection for Aarch64 on Linux.
 
-#[path = "../cache.rs"]
-mod cache;
-#[path = "../bit.rs"]
-mod bit;
-#[path = "auxvec.rs"]
-mod auxvec;
-#[path = "cpuinfo.rs"]
-mod cpuinfo;
-
 use arch::detect::Feature;
+use arch::detect::cache;
+use arch::detect::bit;
+use super::auxvec;
+use super::cpuinfo;
 
 /// Performs run-time feature detection.
 pub fn check_for(x: Feature) -> bool {

stdsimd/arch/detect/mod.rs

@@ -1,15 +1,10 @@
 //! Run-time feature detection for ARM on Linux.
 
-#[path = "../cache.rs"]
-mod cache;
-#[path = "../bit.rs"]
-mod bit;
-#[path = "auxvec.rs"]
-mod auxvec;
-#[path = "cpuinfo.rs"]
-mod cpuinfo;
-
 use arch::detect::Feature;
+use arch::detect::cache;
+use arch::detect::bit;
+use super::auxvec;
+use super::cpuinfo;
 
 /// Performs run-time feature detection.
 pub fn check_for(x: Feature) -> bool {

stdsimd/arch/detect/os/linux/aarch64.rs

@@ -1,9 +1,10 @@
 //! Parses ELF auxiliary vectors.
+#![cfg_attr(not(target_arch = "aarch64"), allow(dead_code))]
 
-use core::mem;
-use _std::prelude::v1::*;
-use _std::fs::File;
-use _std::io::Read;
+use mem;
+use prelude::v1::*;
+use fs::File;
+use io::Read;
 
 /// Key to access the CPU Hardware capabilities bitfield.
 pub const AT_HWCAP: usize = 16;
@@ -68,6 +69,7 @@ pub fn auxv() -> Result<AuxVec, ()> {
                 }
             }
         }
+        drop(hwcap);
     }
     // If calling getauxval fails, try to read the auxiliary vector from
     // its file:
@@ -144,6 +146,7 @@ fn auxv_from_buf(buf: &[usize; 64]) -> Result<AuxVec, ()> {
             return Ok(AuxVec { hwcap, hwcap2 });
         }
     }
+    drop(buf);
     Err(())
 }
 
@@ -179,7 +182,7 @@ mod tests {
 
     // FIXME: on mips/mips64 getauxval returns 0, and /proc/self/auxv
     // does not always contain the AT_HWCAP key under qemu.
-    #[cfg(not(any(target_arch = "mips", target_arch = "mips64")))]
+    #[cfg(not(any(target_arch = "mips", target_arch = "mips64", target_arch = "powerpc")))]
     #[test]
     fn auxv_crate() {
         let v = auxv();

stdsimd/arch/detect/os/linux/arm.rs

@@ -1,4 +1,5 @@
 //! Parses /proc/cpuinfo
+#![cfg_attr(not(target_arch = "arm"), allow(dead_code))]
 
 use prelude::v1::*;
 use fs::File;

stdsimd/arch/detect/os/linux/auxvec.rs

@@ -1,13 +1,9 @@
 //! Run-time feature detection for MIPS on Linux.
 
-#[path = "../cache.rs"]
-mod cache;
-#[path = "../bit.rs"]
-mod bit;
-#[path = "auxvec.rs"]
-mod auxvec;
-
 use arch::detect::Feature;
+use arch::detect::cache;
+use arch::detect::bit;
+use super::auxvec;
 
 /// Performs run-time feature detection.
 pub fn check_for(x: Feature) -> bool {

stdsimd/arch/detect/os/linux/cpuinfo.rs

@@ -1,5 +1,8 @@
 //! Run-time feature detection on Linux
 
+mod auxvec;
+mod cpuinfo;
+
 cfg_if! {
     if #[cfg(target_arch = "aarch64")] {
         mod aarch64;

stdsimd/arch/detect/os/linux/mips.rs

@@ -1,13 +1,9 @@
 //! Run-time feature detection for ARM on Linux.
 
-#[path = "../cache.rs"]
-mod cache;
-#[path = "auxvec.rs"]
-mod auxvec;
-#[path = "cpuinfo.rs"]
-mod cpuinfo;
-
 use arch::detect::Feature;
+use arch::detect::cache;
+use super::auxvec;
+use super::cpuinfo;
 
 /// Performs run-time feature detection.
 pub fn check_for(x: Feature) -> bool {

stdsimd/arch/detect/os/linux/mod.rs

@@ -7,12 +7,9 @@ use coresimd::arch::x86::*;
 #[cfg(target_arch = "x86_64")]
 use coresimd::arch::x86_64::*;
 
-#[path = "cache.rs"]
-mod cache;
-#[path = "bit.rs"]
-mod bit;
-
 use arch::detect::Feature;
+use arch::detect::cache;
+use arch::detect::bit;
 
 /// Performs run-time feature detection.
 pub fn check_for(x: Feature) -> bool {