summary refs log tree commit diff
path: root/usb_util
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2019-03-08 15:57:49 -0800
committerchrome-bot <chrome-bot@chromium.org>2019-03-13 21:05:03 -0700
commitfe3ef7d99892fad804cbc9de8801033fd483f337 (patch)
treeb07b227d98466d14e61660d144e85109bc632abd /usb_util
parentfa132759424c5019dc9086e53d8db14500fee64f (diff)
downloadcrosvm-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 'usb_util')
-rw-r--r--usb_util/src/config_descriptor.rs6
-rw-r--r--usb_util/src/device_handle.rs8
-rw-r--r--usb_util/src/endpoint_descriptor.rs5
-rw-r--r--usb_util/src/error.rs2
-rw-r--r--usb_util/src/interface_descriptor.rs5
-rw-r--r--usb_util/src/libusb_context.rs10
-rw-r--r--usb_util/src/libusb_device.rs14
-rw-r--r--usb_util/src/types.rs3
-rw-r--r--usb_util/src/usb_transfer.rs6
9 files changed, 31 insertions, 28 deletions
diff --git a/usb_util/src/config_descriptor.rs b/usb_util/src/config_descriptor.rs
index debfcb3..8aebbac 100644
--- a/usb_util/src/config_descriptor.rs
+++ b/usb_util/src/config_descriptor.rs
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-use super::interface_descriptor::InterfaceDescriptor;
-use bindings;
-use bindings::libusb_config_descriptor;
 use std::ops::Deref;
 
+use crate::bindings::{self, libusb_config_descriptor};
+use crate::interface_descriptor::InterfaceDescriptor;
+
 /// ConfigDescriptor wraps libusb_config_descriptor.
 pub struct ConfigDescriptor {
     descriptor: *mut libusb_config_descriptor,
diff --git a/usb_util/src/device_handle.rs b/usb_util/src/device_handle.rs
index 57432b2..72ee178 100644
--- a/usb_util/src/device_handle.rs
+++ b/usb_util/src/device_handle.rs
@@ -5,10 +5,10 @@
 use std::os::raw::c_int;
 use std::sync::Arc;
 
-use bindings;
-use error::{Error, Result};
-use libusb_context::LibUsbContextInner;
-use usb_transfer::{UsbTransfer, UsbTransferBuffer};
+use crate::bindings;
+use crate::error::{Error, Result};
+use crate::libusb_context::LibUsbContextInner;
+use crate::usb_transfer::{UsbTransfer, UsbTransferBuffer};
 
 /// DeviceHandle wraps libusb_device_handle.
 pub struct DeviceHandle {
diff --git a/usb_util/src/endpoint_descriptor.rs b/usb_util/src/endpoint_descriptor.rs
index f1ca229..29eb4ea 100644
--- a/usb_util/src/endpoint_descriptor.rs
+++ b/usb_util/src/endpoint_descriptor.rs
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-use super::types::{EndpointDirection, EndpointType};
-use bindings::libusb_endpoint_descriptor;
 use std::ops::Deref;
 
+use crate::bindings::libusb_endpoint_descriptor;
+use crate::types::{EndpointDirection, EndpointType};
+
 /// EndpointDescriptor wraps libusb_endpoint_descriptor.
 pub struct EndpointDescriptor<'a>(&'a libusb_endpoint_descriptor);
 
diff --git a/usb_util/src/error.rs b/usb_util/src/error.rs
index e819a52..b6dd91e 100644
--- a/usb_util/src/error.rs
+++ b/usb_util/src/error.rs
@@ -5,7 +5,7 @@
 use std;
 use std::fmt;
 
-use bindings;
+use crate::bindings;
 
 /// Error type for libusb.
 pub enum Error {
diff --git a/usb_util/src/interface_descriptor.rs b/usb_util/src/interface_descriptor.rs
index 3393f3a..a2bf1b2 100644
--- a/usb_util/src/interface_descriptor.rs
+++ b/usb_util/src/interface_descriptor.rs
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-use super::endpoint_descriptor::EndpointDescriptor;
-use bindings::libusb_interface_descriptor;
 use std::ops::Deref;
 
+use crate::bindings::libusb_interface_descriptor;
+use crate::endpoint_descriptor::EndpointDescriptor;
+
 /// InterfaceDescriptor wraps libusb_interface_descriptor.
 pub struct InterfaceDescriptor<'a>(&'a libusb_interface_descriptor);
 
diff --git a/usb_util/src/libusb_context.rs b/usb_util/src/libusb_context.rs
index 7197f9a..0afaf7e 100644
--- a/usb_util/src/libusb_context.rs
+++ b/usb_util/src/libusb_context.rs
@@ -5,13 +5,13 @@
 use std;
 use std::os::raw::{c_short, c_void};
 use std::os::unix::io::RawFd;
-
-use bindings;
-use error::{Error, Result};
-use hotplug::{hotplug_cb, UsbHotplugHandler, UsbHotplugHandlerHolder};
-use libusb_device::LibUsbDevice;
 use std::sync::Arc;
 
+use crate::bindings;
+use crate::error::{Error, Result};
+use crate::hotplug::{hotplug_cb, UsbHotplugHandler, UsbHotplugHandlerHolder};
+use crate::libusb_device::LibUsbDevice;
+
 use sync::Mutex;
 
 pub struct LibUsbContextInner {
diff --git a/usb_util/src/libusb_device.rs b/usb_util/src/libusb_device.rs
index d1a6e47..3955327 100644
--- a/usb_util/src/libusb_device.rs
+++ b/usb_util/src/libusb_device.rs
@@ -3,15 +3,15 @@
 // found in the LICENSE file.
 
 use std;
-
-use bindings;
-use config_descriptor::ConfigDescriptor;
-use device_handle::DeviceHandle;
-use error::{Error, Result};
-use libusb_context::LibUsbContextInner;
 use std::os::unix::io::RawFd;
 use std::sync::Arc;
-use types::Speed;
+
+use crate::bindings;
+use crate::config_descriptor::ConfigDescriptor;
+use crate::device_handle::DeviceHandle;
+use crate::error::{Error, Result};
+use crate::libusb_context::LibUsbContextInner;
+use crate::types::Speed;
 
 pub type DeviceDescriptor = bindings::libusb_device_descriptor;
 
diff --git a/usb_util/src/types.rs b/usb_util/src/types.rs
index 2fc1723..0c7250d 100644
--- a/usb_util/src/types.rs
+++ b/usb_util/src/types.rs
@@ -3,11 +3,12 @@
 // found in the LICENSE file.
 
 use assertions::const_assert;
-use bindings;
 use data_model::DataInit;
 
 use std::mem::size_of;
 
+use crate::bindings;
+
 /// Speed of usb device. See usb spec for more details.
 #[derive(Debug)]
 pub enum Speed {
diff --git a/usb_util/src/usb_transfer.rs b/usb_util/src/usb_transfer.rs
index 93f3979..d3354ef 100644
--- a/usb_util/src/usb_transfer.rs
+++ b/usb_util/src/usb_transfer.rs
@@ -6,15 +6,15 @@ use std::mem::size_of;
 use std::os::raw::c_void;
 use std::sync::{Arc, Weak};
 
-use bindings::{
+use crate::bindings::{
     libusb_alloc_transfer, libusb_cancel_transfer, libusb_device_handle, libusb_free_transfer,
     libusb_submit_transfer, libusb_transfer, libusb_transfer_status, LIBUSB_TRANSFER_CANCELLED,
     LIBUSB_TRANSFER_COMPLETED, LIBUSB_TRANSFER_ERROR, LIBUSB_TRANSFER_NO_DEVICE,
     LIBUSB_TRANSFER_OVERFLOW, LIBUSB_TRANSFER_STALL, LIBUSB_TRANSFER_TIMED_OUT,
     LIBUSB_TRANSFER_TYPE_BULK, LIBUSB_TRANSFER_TYPE_CONTROL, LIBUSB_TRANSFER_TYPE_INTERRUPT,
 };
-use error::{Error, Result};
-use types::UsbRequestSetup;
+use crate::error::{Error, Result};
+use crate::types::UsbRequestSetup;
 
 /// Status of transfer.
 #[derive(PartialEq)]