diff options
author | David Tolnay <dtolnay@chromium.org> | 2019-03-08 15:57:49 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-13 21:05:03 -0700 |
commit | fe3ef7d99892fad804cbc9de8801033fd483f337 (patch) | |
tree | b07b227d98466d14e61660d144e85109bc632abd /devices/src/virtio | |
parent | fa132759424c5019dc9086e53d8db14500fee64f (diff) | |
download | crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar.gz crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar.bz2 crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar.lz crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar.xz crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar.zst crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.zip |
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>
Diffstat (limited to 'devices/src/virtio')
-rw-r--r-- | devices/src/virtio/input/defaults.rs | 5 | ||||
-rw-r--r-- | devices/src/virtio/virtio_device.rs | 5 | ||||
-rw-r--r-- | devices/src/virtio/virtio_pci_device.rs | 9 |
3 files changed, 11 insertions, 8 deletions
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; |