diff options
author | 2019-02-14 14:32:21 -0800 | |
---|---|---|
committer | 2019-02-14 14:52:15 -0800 | |
commit | 8f30a2fc3d5d73f90a4ba64d0a90348e59e7967b (patch) | |
tree | b9d29e6e317c5f3b23c8a88127c42d72b750cff4 /src/bits64 | |
parent | 4c838b6691b6ec47a08b5be327b90bd2423203e2 (diff) | |
download | rust-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/bits64')
-rw-r--r-- | src/bits64/paging.rs | 3 | ||||
-rw-r--r-- | src/bits64/rflags.rs | 4 | ||||
-rw-r--r-- | src/bits64/segmentation.rs | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/bits64/paging.rs b/src/bits64/paging.rs index 90a8f9c..024f7d5 100644 --- a/src/bits64/paging.rs +++ b/src/bits64/paging.rs @@ -1,4 +1,7 @@ //! Description of the data-structures for IA-32e paging mode. + +use bitflags::*; + use core::convert::{From, Into}; use core::fmt; use core::ops; diff --git a/src/bits64/rflags.rs b/src/bits64/rflags.rs index 0fac008..fe1d633 100644 --- a/src/bits64/rflags.rs +++ b/src/bits64/rflags.rs @@ -4,7 +4,9 @@ //! The upper 32 bits of RFLAGS register is reserved. //! The lower 32 bits of RFLAGS is the same as EFLAGS. -use Ring; +use bitflags::*; + +use crate::Ring; /// The RFLAGS register. /// This is duplicated code from bits32 eflags.rs. diff --git a/src/bits64/segmentation.rs b/src/bits64/segmentation.rs index 02a0788..978025f 100644 --- a/src/bits64/segmentation.rs +++ b/src/bits64/segmentation.rs @@ -1,6 +1,6 @@ #[allow(unused_imports)] -use segmentation::SegmentSelector; -use segmentation::{ +use crate::segmentation::SegmentSelector; +use crate::segmentation::{ BuildDescriptor, Descriptor, DescriptorBuilder, DescriptorType, GateDescriptorBuilder, LdtDescriptorBuilder, SystemDescriptorTypes64, }; |