From 8f30a2fc3d5d73f90a4ba64d0a90348e59e7967b Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Thu, 14 Feb 2019 14:32:21 -0800 Subject: update to Rust 2018 edition * specify 2018 edition in the manifest * changes to fix build with 2018 edition --- src/lib.rs | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'src/lib.rs') diff --git a/src/lib.rs b/src/lib.rs index 234de11..97a6922 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,21 +4,10 @@ #![no_std] #![cfg_attr(test, allow(unused_features))] -#[macro_use] -extern crate bitflags; -extern crate raw_cpuid; -#[cfg(feature = "performance-counter")] -#[macro_use] -extern crate phf; - -#[cfg(test)] -#[macro_use] -extern crate std; - #[cfg(target_arch = "x86")] -use core::arch::x86 as arch; +pub(crate) use core::arch::x86 as arch; #[cfg(target_arch = "x86_64")] -use core::arch::x86_64 as arch; +pub(crate) use core::arch::x86_64 as arch; macro_rules! bit { ($x:expr) => { @@ -48,7 +37,7 @@ pub mod current { #[cfg(target_arch = "x86")] pub use bits32::*; #[cfg(target_arch = "x86_64")] - pub use bits64::*; + pub use crate::bits64::*; } pub mod cpuid { -- cgit v1.2.3