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>

15 files changed, 40 insertions, 36 deletions

diff --git a/devices/src/cmos.rs b/devices/src/cmos.rs
index 5c04678..7cf9006 100644
--- a/devices/src/cmos.rs
+++ b/devices/src/cmos.rs
@@ -5,7 +5,7 @@
 use libc::{gmtime_r, time, time_t, tm};
 use std::mem;
 
-use BusDevice;
+use crate::BusDevice;
 
 const INDEX_MASK: u8 = 0x7f;
 const INDEX_OFFSET: u64 = 0x0;
diff --git a/devices/src/i8042.rs b/devices/src/i8042.rs
index 5e35a5a..7feae8c 100644
--- a/devices/src/i8042.rs
+++ b/devices/src/i8042.rs
@@ -4,7 +4,7 @@
 
 use sys_util::EventFd;
 
-use BusDevice;
+use crate::BusDevice;
 
 /// A i8042 PS/2 controller that emulates just enough to shutdown the machine.
 pub struct I8042Device {
diff --git a/devices/src/pci/ac97.rs b/devices/src/pci/ac97.rs
index fc120a4..e58618d 100644
--- a/devices/src/pci/ac97.rs
+++ b/devices/src/pci/ac97.rs
@@ -5,17 +5,18 @@
 use std::os::unix::io::RawFd;
 
 use audio_streams::StreamSource;
-use pci::ac97_bus_master::Ac97BusMaster;
-use pci::ac97_mixer::Ac97Mixer;
-use pci::ac97_regs::*;
-use pci::pci_configuration::{
-    PciBarConfiguration, PciClassCode, PciConfiguration, PciHeaderType, PciMultimediaSubclass,
-};
-use pci::pci_device::{self, PciDevice, Result};
-use pci::PciInterruptPin;
 use resources::SystemAllocator;
 use sys_util::{EventFd, GuestMemory};
 
+use crate::pci::ac97_bus_master::Ac97BusMaster;
+use crate::pci::ac97_mixer::Ac97Mixer;
+use crate::pci::ac97_regs::*;
+use crate::pci::pci_configuration::{
+    PciBarConfiguration, PciClassCode, PciConfiguration, PciHeaderType, PciMultimediaSubclass,
+};
+use crate::pci::pci_device::{self, PciDevice, Result};
+use crate::pci::PciInterruptPin;
+
 // Use 82801AA because it's what qemu does.
 const PCI_DEVICE_ID_INTEL_82801AA_5: u16 = 0x2415;
 
diff --git a/devices/src/pci/ac97_bus_master.rs b/devices/src/pci/ac97_bus_master.rs
index 4ea9097..7d169a3 100644
--- a/devices/src/pci/ac97_bus_master.rs
+++ b/devices/src/pci/ac97_bus_master.rs
@@ -14,11 +14,12 @@ use std::time::Instant;
 
 use audio_streams::{PlaybackBuffer, PlaybackBufferStream, StreamControl, StreamSource};
 use data_model::{VolatileMemory, VolatileSlice};
-use pci::ac97_mixer::Ac97Mixer;
-use pci::ac97_regs::*;
 use sync::Mutex;
 use sys_util::{self, set_rt_prio_limit, set_rt_round_robin, EventFd, GuestAddress, GuestMemory};
 
+use crate::pci::ac97_mixer::Ac97Mixer;
+use crate::pci::ac97_regs::*;
+
 const DEVICE_SAMPLE_RATE: usize = 48000;
 
 // Bus Master registers. Keeps the state of the bus master register values. Used to share the state
diff --git a/devices/src/pci/ac97_mixer.rs b/devices/src/pci/ac97_mixer.rs
index 58db533..8c8e192 100644
--- a/devices/src/pci/ac97_mixer.rs
+++ b/devices/src/pci/ac97_mixer.rs
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-use pci::ac97_regs::*;
+use crate::pci::ac97_regs::*;
 
 // AC97 Vendor ID
 const AC97_VENDOR_ID1: u16 = 0x8086;
diff --git a/devices/src/pci/pci_configuration.rs b/devices/src/pci/pci_configuration.rs
index 3aac1c8..532faef 100644
--- a/devices/src/pci/pci_configuration.rs
+++ b/devices/src/pci/pci_configuration.rs
@@ -4,7 +4,7 @@
 
 use std::fmt::{self, Display};
 
-use pci::PciInterruptPin;
+use crate::pci::PciInterruptPin;
 
 // The number of 32bit registers in the config space, 256 bytes.
 const NUM_CONFIGURATION_REGISTERS: usize = 64;
diff --git a/devices/src/pci/pci_device.rs b/devices/src/pci/pci_device.rs
index bd811b5..f8f249b 100644
--- a/devices/src/pci/pci_device.rs
+++ b/devices/src/pci/pci_device.rs
@@ -9,12 +9,12 @@ use std::fmt::{self, Display};
 use std::os::unix::io::RawFd;
 
 use kvm::Datamatch;
-use pci::pci_configuration::{self, PciConfiguration};
-use pci::PciInterruptPin;
 use resources::SystemAllocator;
 use sys_util::EventFd;
 
-use BusDevice;
+use crate::pci::pci_configuration::{self, PciConfiguration};
+use crate::pci::PciInterruptPin;
+use crate::BusDevice;
 
 #[derive(Debug)]
 pub enum Error {
diff --git a/devices/src/pci/pci_root.rs b/devices/src/pci/pci_root.rs
index b432be2..781fbd6 100644
--- a/devices/src/pci/pci_root.rs
+++ b/devices/src/pci/pci_root.rs
@@ -6,13 +6,13 @@ use std::os::unix::io::RawFd;
 use std::sync::Arc;
 
 use byteorder::{ByteOrder, LittleEndian};
-
 use sync::Mutex;
 
-use BusDevice;
-
-use pci::pci_configuration::{PciBridgeSubclass, PciClassCode, PciConfiguration, PciHeaderType};
-use pci::pci_device::PciDevice;
+use crate::pci::pci_configuration::{
+    PciBridgeSubclass, PciClassCode, PciConfiguration, PciHeaderType,
+};
+use crate::pci::pci_device::PciDevice;
+use crate::BusDevice;
 
 // A PciDevice that holds the root hub's configuration.
 struct PciRootConfiguration {
diff --git a/devices/src/pit.rs b/devices/src/pit.rs
index 05d507a..2012b91 100644
--- a/devices/src/pit.rs
+++ b/devices/src/pit.rs
@@ -25,7 +25,7 @@ use sys_util::FakeTimerFd as TimerFd;
 #[cfg(not(test))]
 use sys_util::TimerFd;
 
-use BusDevice;
+use crate::BusDevice;
 
 // Bitmask for areas of standard (non-ReadBack) Control Word Format. Constant
 // names are kept the same as Intel PIT data sheet.
diff --git a/devices/src/pl030.rs b/devices/src/pl030.rs
index 63fedc8..35fbba4 100644
--- a/devices/src/pl030.rs
+++ b/devices/src/pl030.rs
@@ -5,7 +5,7 @@
 use std::time::{SystemTime, UNIX_EPOCH};
 use sys_util::EventFd;
 
-use BusDevice;
+use crate::BusDevice;
 
 // Register offsets
 // Data register
diff --git a/devices/src/proxy.rs b/devices/src/proxy.rs
index e7cc95f..18d0be0 100644
--- a/devices/src/proxy.rs
+++ b/devices/src/proxy.rs
@@ -4,8 +4,6 @@
 
 //! Runs hardware devices in child processes.
 
-use libc::pid_t;
-
 use std::fmt::{self, Display};
 use std::os::unix::io::{AsRawFd, RawFd};
 use std::process;
@@ -13,10 +11,11 @@ use std::time::Duration;
 use std::{self, io};
 
 use io_jail::{self, Minijail};
+use libc::pid_t;
 use msg_socket::{MsgOnSocket, MsgReceiver, MsgSender, MsgSocket};
 use sys_util::net::UnixSeqpacket;
 
-use BusDevice;
+use crate::BusDevice;
 
 /// Errors for proxy devices.
 #[derive(Debug)]
diff --git a/devices/src/serial.rs b/devices/src/serial.rs
index c4c5a8b..6afcf52 100644
--- a/devices/src/serial.rs
+++ b/devices/src/serial.rs
@@ -7,7 +7,7 @@ use std::io;
 
 use sys_util::{EventFd, Result};
 
-use BusDevice;
+use crate::BusDevice;
 
 const LOOP_SIZE: usize = 0x40;
 
diff --git a/devices/src/virtio/input/defaults.rs b/devices/src/virtio/input/defaults.rs
index a7a01d9..347f3a7 100644
--- a/devices/src/virtio/input/defaults.rs
+++ b/devices/src/virtio/input/defaults.rs
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+use std::collections::BTreeMap;
+
 use super::constants::*;
+use super::virtio_input_absinfo;
 use super::virtio_input_bitmap;
 use super::virtio_input_device_ids;
 use super::VirtioInputConfig;
-use std::collections::BTreeMap;
-use virtio::input::virtio_input_absinfo;
 
 /// Instantiates a VirtioInputConfig object with the default configuration for a trackpad. It
 /// supports touch, left button and right button events, as well as X and Y axis.
diff --git a/devices/src/virtio/virtio_device.rs b/devices/src/virtio/virtio_device.rs
index d6fe9b5..e1b235f 100644
--- a/devices/src/virtio/virtio_device.rs
+++ b/devices/src/virtio/virtio_device.rs
@@ -6,10 +6,11 @@ use std::os::unix::io::RawFd;
 use std::sync::atomic::AtomicUsize;
 use std::sync::Arc;
 
-use super::*;
-use pci::{PciBarConfiguration, PciCapability};
 use sys_util::{EventFd, GuestMemory};
 
+use super::*;
+use crate::pci::{PciBarConfiguration, PciCapability};
+
 /// Trait for virtio devices to be driven by a virtio transport.
 ///
 /// The lifecycle of a virtio device is to be moved to a virtio transport, which will then query the
diff --git a/devices/src/virtio/virtio_pci_device.rs b/devices/src/virtio/virtio_pci_device.rs
index 35f227d..bc8b322 100644
--- a/devices/src/virtio/virtio_pci_device.rs
+++ b/devices/src/virtio/virtio_pci_device.rs
@@ -7,15 +7,16 @@ use std::os::unix::io::{AsRawFd, RawFd};
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 
-use super::*;
 use data_model::{DataInit, Le32};
 use kvm::Datamatch;
-use pci::{
+use resources::SystemAllocator;
+use sys_util::{EventFd, GuestMemory, Result};
+
+use super::*;
+use crate::pci::{
     PciBarConfiguration, PciCapability, PciCapabilityID, PciClassCode, PciConfiguration, PciDevice,
     PciDeviceError, PciHeaderType, PciInterruptPin, PciSubclass,
 };
-use resources::SystemAllocator;
-use sys_util::{EventFd, GuestMemory, Result};
 
 use self::virtio_pci_common_config::VirtioPciCommonConfig;