aboutsummaryrefslogtreecommitdiff
path: root/src/lib.rs
diff options
context:
space:
mode:
authorGravatar Brian Martin <bmartin@twitter.com> 2019-02-14 14:32:21 -0800
committerGravatar Brian Martin <bmartin@twitter.com> 2019-02-14 14:52:15 -0800
commit8f30a2fc3d5d73f90a4ba64d0a90348e59e7967b (patch)
treeb9d29e6e317c5f3b23c8a88127c42d72b750cff4 /src/lib.rs
parent4c838b6691b6ec47a08b5be327b90bd2423203e2 (diff)
downloadrust-x86-8f30a2fc3d5d73f90a4ba64d0a90348e59e7967b.tar.gz
rust-x86-8f30a2fc3d5d73f90a4ba64d0a90348e59e7967b.tar.zst
rust-x86-8f30a2fc3d5d73f90a4ba64d0a90348e59e7967b.zip
update to Rust 2018 edition
* specify 2018 edition in the manifest * changes to fix build with 2018 edition
Diffstat (limited to 'src/lib.rs')
-rw-r--r--src/lib.rs17
1 files changed, 3 insertions, 14 deletions
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 {