From e1952dd7d40fe45804cedcafc43c87a5d064b0c5 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Thu, 23 Apr 2020 13:31:44 -0700 Subject: Remove redundant single-component imports Fix clippy 1.43.0 clippy::single-component-path-imports warnings. BUG=None TEST=bin/clippy Change-Id: I3f4f54138bedce16dc1ca937bb8bc00a94594f69 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2163203 Reviewed-by: Zach Reizner Tested-by: Daniel Verkamp Commit-Queue: Daniel Verkamp --- devices/src/pci/ac97_bus_master.rs | 1 - devices/src/pci/pci_device.rs | 1 - devices/src/register_space/register.rs | 1 - devices/src/usb/xhci/event_ring.rs | 1 - devices/src/usb/xhci/xhci_abi.rs | 2 -- devices/src/virtio/balloon.rs | 1 - devices/src/virtio/fs/filesystem.rs | 2 -- devices/src/virtio/fs/fuse.rs | 1 - devices/src/virtio/fs/passthrough.rs | 1 - devices/src/virtio/fs/server.rs | 1 - devices/src/virtio/net.rs | 1 - devices/src/virtio/p9.rs | 1 - devices/src/virtio/rng.rs | 1 - devices/src/virtio/tpm.rs | 1 - devices/src/virtio/vhost/mod.rs | 1 - devices/src/virtio/vhost/net.rs | 1 - devices/src/virtio/virtio_pci_device.rs | 1 - 17 files changed, 19 deletions(-) (limited to 'devices') diff --git a/devices/src/pci/ac97_bus_master.rs b/devices/src/pci/ac97_bus_master.rs index 809f31f..22f3c92 100644 --- a/devices/src/pci/ac97_bus_master.rs +++ b/devices/src/pci/ac97_bus_master.rs @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -use std; use std::collections::VecDeque; use std::convert::AsRef; use std::convert::TryInto; diff --git a/devices/src/pci/pci_device.rs b/devices/src/pci/pci_device.rs index a1a3cca..2f74ea1 100644 --- a/devices/src/pci/pci_device.rs +++ b/devices/src/pci/pci_device.rs @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -use std; use std::fmt::{self, Display}; use std::os::unix::io::RawFd; diff --git a/devices/src/register_space/register.rs b/devices/src/register_space/register.rs index c2f5184..2a4f551 100644 --- a/devices/src/register_space/register.rs +++ b/devices/src/register_space/register.rs @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -use std; use std::boxed::Box; use std::cmp::{max, min, Ord, Ordering, PartialOrd}; use std::mem::size_of; diff --git a/devices/src/usb/xhci/event_ring.rs b/devices/src/usb/xhci/event_ring.rs index fcaff23..1742c77 100644 --- a/devices/src/usb/xhci/event_ring.rs +++ b/devices/src/usb/xhci/event_ring.rs @@ -3,7 +3,6 @@ // found in the LICENSE file. use data_model::DataInit; -use std; use std::fmt::{self, Display}; use std::mem::size_of; use std::sync::atomic::{fence, Ordering}; diff --git a/devices/src/usb/xhci/xhci_abi.rs b/devices/src/usb/xhci/xhci_abi.rs index 5a8748e..e9be3c3 100644 --- a/devices/src/usb/xhci/xhci_abi.rs +++ b/devices/src/usb/xhci/xhci_abi.rs @@ -8,8 +8,6 @@ use data_model::DataInit; use std::fmt::{self, Display}; use sys_util::GuestAddress; -use std; - #[derive(Debug)] pub enum Error { UnknownTrbType(BitFieldError), diff --git a/devices/src/virtio/balloon.rs b/devices/src/virtio/balloon.rs index 6df7dfb..30417fa 100644 --- a/devices/src/virtio/balloon.rs +++ b/devices/src/virtio/balloon.rs @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -use std; use std::fmt::{self, Display}; use std::os::unix::io::{AsRawFd, RawFd}; use std::sync::atomic::{AtomicUsize, Ordering}; diff --git a/devices/src/virtio/fs/filesystem.rs b/devices/src/virtio/fs/filesystem.rs index 3f9528f..474a278 100644 --- a/devices/src/virtio/fs/filesystem.rs +++ b/devices/src/virtio/fs/filesystem.rs @@ -9,8 +9,6 @@ use std::io; use std::mem; use std::time::Duration; -use libc; - use crate::virtio::fs::fuse; pub use fuse::{FsOptions, IoctlFlags, IoctlIovec, OpenOptions, SetattrValid, ROOT_ID}; diff --git a/devices/src/virtio/fs/fuse.rs b/devices/src/virtio/fs/fuse.rs index 5c531cf..981596b 100644 --- a/devices/src/virtio/fs/fuse.rs +++ b/devices/src/virtio/fs/fuse.rs @@ -7,7 +7,6 @@ use std::mem; use bitflags::bitflags; use data_model::DataInit; use enumn::N; -use libc; /// Version number of this interface. pub const KERNEL_VERSION: u32 = 7; diff --git a/devices/src/virtio/fs/passthrough.rs b/devices/src/virtio/fs/passthrough.rs index 3488a70..bcc7c5d 100644 --- a/devices/src/virtio/fs/passthrough.rs +++ b/devices/src/virtio/fs/passthrough.rs @@ -15,7 +15,6 @@ use std::sync::Arc; use std::time::Duration; use data_model::DataInit; -use libc; use sync::Mutex; use sys_util::{error, ioctl_ior_nr, ioctl_iow_nr, ioctl_with_mut_ptr, ioctl_with_ptr}; diff --git a/devices/src/virtio/fs/server.rs b/devices/src/virtio/fs/server.rs index bb5f8b6..6774b7b 100644 --- a/devices/src/virtio/fs/server.rs +++ b/devices/src/virtio/fs/server.rs @@ -8,7 +8,6 @@ use std::io::{self, Read, Write}; use std::mem::size_of; use data_model::DataInit; -use libc; use sys_util::error; use crate::virtio::fs::filesystem::{ diff --git a/devices/src/virtio/net.rs b/devices/src/virtio/net.rs index a15ab03..8e9aa9e 100644 --- a/devices/src/virtio/net.rs +++ b/devices/src/virtio/net.rs @@ -13,7 +13,6 @@ use std::sync::Arc; use std::thread; use data_model::{DataInit, Le16, Le64}; -use net_sys; use net_util::{Error as TapError, MacAddress, TapT}; use sys_util::Error as SysError; use sys_util::{error, warn, EventFd, GuestMemory, PollContext, PollToken, WatchingEvents}; diff --git a/devices/src/virtio/p9.rs b/devices/src/virtio/p9.rs index 5e483c3..7854c39 100644 --- a/devices/src/virtio/p9.rs +++ b/devices/src/virtio/p9.rs @@ -10,7 +10,6 @@ use std::path::{Path, PathBuf}; use std::result; use std::thread; -use p9; use sys_util::{error, warn, Error as SysError, EventFd, GuestMemory, PollContext, PollToken}; use virtio_sys::vhost::VIRTIO_F_VERSION_1; diff --git a/devices/src/virtio/rng.rs b/devices/src/virtio/rng.rs index 80c6bd1..3d7801f 100644 --- a/devices/src/virtio/rng.rs +++ b/devices/src/virtio/rng.rs @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -use std; use std::fmt::{self, Display}; use std::fs::File; use std::io; diff --git a/devices/src/virtio/tpm.rs b/devices/src/virtio/tpm.rs index 95f7092..727c634 100644 --- a/devices/src/virtio/tpm.rs +++ b/devices/src/virtio/tpm.rs @@ -12,7 +12,6 @@ use std::path::PathBuf; use std::thread; use sys_util::{error, EventFd, GuestMemory, PollContext, PollToken}; -use tpm2; use super::{ DescriptorChain, DescriptorError, Interrupt, Queue, Reader, VirtioDevice, Writer, TYPE_TPM, diff --git a/devices/src/virtio/vhost/mod.rs b/devices/src/virtio/vhost/mod.rs index 86ed81e..4d7623f 100644 --- a/devices/src/virtio/vhost/mod.rs +++ b/devices/src/virtio/vhost/mod.rs @@ -4,7 +4,6 @@ //! Implements vhost-based virtio devices. -use std; use std::fmt::{self, Display}; use net_util::Error as TapError; diff --git a/devices/src/virtio/vhost/net.rs b/devices/src/virtio/vhost/net.rs index 681cfe8..ce13226 100644 --- a/devices/src/virtio/vhost/net.rs +++ b/devices/src/virtio/vhost/net.rs @@ -7,7 +7,6 @@ use std::net::Ipv4Addr; use std::os::unix::io::{AsRawFd, RawFd}; use std::thread; -use net_sys; use net_util::{MacAddress, TapT}; use sys_util::{error, warn, EventFd, GuestMemory}; diff --git a/devices/src/virtio/virtio_pci_device.rs b/devices/src/virtio/virtio_pci_device.rs index e63abe9..61409f3 100644 --- a/devices/src/virtio/virtio_pci_device.rs +++ b/devices/src/virtio/virtio_pci_device.rs @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -use std; use std::os::unix::io::{AsRawFd, RawFd}; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::Arc; -- cgit 1.4.1