edition: Update absolute paths to 2018 style

This is an easy step toward adopting 2018 edition eventually, and will
make any future CL that sets `edition = "2018"` this much smaller.

The module system changes in Rust 2018 are described here:

https://doc.rust-lang.org/edition-guide/rust-2018/module-system/path-clarity.html

Generated by running:

    cargo fix --edition --all

in each workspace, followed by bin/fmt.

TEST=cargo check
TEST=cargo check --all-features
TEST=cargo check --target aarch64-unknown-linux-gnu

Change-Id: I000ab5e69d69aa222c272fae899464bbaf65f6d8
Reviewed-on: https://chromium-review.googlesource.com/1513054
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: David Tolnay <dtolnay@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: David Tolnay <dtolnay@chromium.org>

4 files changed, 19 insertions, 18 deletions

diff --git a/x86_64/src/fdt.rs b/x86_64/src/fdt.rs
index d725ffe..8fc81ea 100644
--- a/x86_64/src/fdt.rs
+++ b/x86_64/src/fdt.rs
@@ -5,15 +5,15 @@
 extern crate arch;
 
 use arch::fdt::{begin_node, end_node, finish_fdt, property_string, start_fdt, Error};
-use bootparam::setup_data;
-use bootparam::SETUP_DTB;
 use std::fs::File;
 use std::io::BufRead;
 use std::io::BufReader;
 use std::mem;
 use sys_util::{GuestAddress, GuestMemory};
 
-use X86_64_FDT_MAX_SIZE;
+use crate::bootparam::setup_data;
+use crate::bootparam::SETUP_DTB;
+use crate::X86_64_FDT_MAX_SIZE;
 
 /// Creates a flattened device tree containing all of the parameters for the
 /// kernel and loads it into the guest memory at the specified offset.
diff --git a/x86_64/src/lib.rs b/x86_64/src/lib.rs
index e200569..0f3c757 100644
--- a/x86_64/src/lib.rs
+++ b/x86_64/src/lib.rs
@@ -77,9 +77,9 @@ use std::io::{self, stdout};
 use std::mem;
 use std::sync::Arc;
 
+use crate::bootparam::boot_params;
+use crate::bootparam::E820_RAM;
 use arch::{RunnableLinuxVm, VmComponents};
-use bootparam::boot_params;
-use bootparam::E820_RAM;
 use devices::{PciConfigIo, PciDevice, PciInterruptPin};
 use io_jail::Minijail;
 use kvm::*;
diff --git a/x86_64/src/mptable.rs b/x86_64/src/mptable.rs
index c2444d0..7d5d622 100644
--- a/x86_64/src/mptable.rs
+++ b/x86_64/src/mptable.rs
@@ -13,7 +13,7 @@ use libc::c_char;
 use devices::PciInterruptPin;
 use sys_util::{GuestAddress, GuestMemory};
 
-use mpspec::*;
+use crate::mpspec::*;
 
 #[derive(Debug)]
 pub enum Error {
diff --git a/x86_64/src/regs.rs b/x86_64/src/regs.rs
index 289d403..e1bd1f3 100644
--- a/x86_64/src/regs.rs
+++ b/x86_64/src/regs.rs
@@ -5,7 +5,6 @@
 use std::fmt::{self, Display};
 use std::{mem, result};
 
-use gdt;
 use kvm;
 use kvm_sys::kvm_fpu;
 use kvm_sys::kvm_msr_entry;
@@ -15,6 +14,8 @@ use kvm_sys::kvm_sregs;
 use sys_util;
 use sys_util::{GuestAddress, GuestMemory};
 
+use crate::gdt;
+
 #[derive(Debug)]
 pub enum Error {
     /// Setting up msrs failed.
@@ -67,55 +68,55 @@ fn create_msr_entries() -> Vec<kvm_msr_entry> {
     let mut entries = Vec::<kvm_msr_entry>::new();
 
     entries.push(kvm_msr_entry {
-        index: ::msr_index::MSR_IA32_SYSENTER_CS,
+        index: crate::msr_index::MSR_IA32_SYSENTER_CS,
         data: 0x0,
         ..Default::default()
     });
     entries.push(kvm_msr_entry {
-        index: ::msr_index::MSR_IA32_SYSENTER_ESP,
+        index: crate::msr_index::MSR_IA32_SYSENTER_ESP,
         data: 0x0,
         ..Default::default()
     });
     entries.push(kvm_msr_entry {
-        index: ::msr_index::MSR_IA32_SYSENTER_EIP,
+        index: crate::msr_index::MSR_IA32_SYSENTER_EIP,
         data: 0x0,
         ..Default::default()
     });
     // x86_64 specific msrs, we only run on x86_64 not x86
     entries.push(kvm_msr_entry {
-        index: ::msr_index::MSR_STAR,
+        index: crate::msr_index::MSR_STAR,
         data: 0x0,
         ..Default::default()
     });
     entries.push(kvm_msr_entry {
-        index: ::msr_index::MSR_CSTAR,
+        index: crate::msr_index::MSR_CSTAR,
         data: 0x0,
         ..Default::default()
     });
     entries.push(kvm_msr_entry {
-        index: ::msr_index::MSR_KERNEL_GS_BASE,
+        index: crate::msr_index::MSR_KERNEL_GS_BASE,
         data: 0x0,
         ..Default::default()
     });
     entries.push(kvm_msr_entry {
-        index: ::msr_index::MSR_SYSCALL_MASK,
+        index: crate::msr_index::MSR_SYSCALL_MASK,
         data: 0x0,
         ..Default::default()
     });
     entries.push(kvm_msr_entry {
-        index: ::msr_index::MSR_LSTAR,
+        index: crate::msr_index::MSR_LSTAR,
         data: 0x0,
         ..Default::default()
     });
     // end of x86_64 specific code
     entries.push(kvm_msr_entry {
-        index: ::msr_index::MSR_IA32_TSC,
+        index: crate::msr_index::MSR_IA32_TSC,
         data: 0x0,
         ..Default::default()
     });
     entries.push(kvm_msr_entry {
-        index: ::msr_index::MSR_IA32_MISC_ENABLE,
-        data: ::msr_index::MSR_IA32_MISC_ENABLE_FAST_STRING as u64,
+        index: crate::msr_index::MSR_IA32_MISC_ENABLE,
+        data: crate::msr_index::MSR_IA32_MISC_ENABLE_FAST_STRING as u64,
         ..Default::default()
     });