summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2019-03-12 20:51:48 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-04-09 01:55:19 -0700
commit115cc1ff8e9cbc3535b5b1e42ed468cc70983ecb (patch)
tree9b9fa0ac88d84e291aeed685d9f4be32a03909f7
parent5b73b7edecec2ad49a0f958d830c122a0309704a (diff)
downloadcrosvm-115cc1ff8e9cbc3535b5b1e42ed468cc70983ecb.tar
crosvm-115cc1ff8e9cbc3535b5b1e42ed468cc70983ecb.tar.gz
crosvm-115cc1ff8e9cbc3535b5b1e42ed468cc70983ecb.tar.bz2
crosvm-115cc1ff8e9cbc3535b5b1e42ed468cc70983ecb.tar.lz
crosvm-115cc1ff8e9cbc3535b5b1e42ed468cc70983ecb.tar.xz
crosvm-115cc1ff8e9cbc3535b5b1e42ed468cc70983ecb.tar.zst
crosvm-115cc1ff8e9cbc3535b5b1e42ed468cc70983ecb.zip
edition: Update usb_util to 2018 edition
Separated out of CL:1513058 to make it possible to land parts
individually while the affected crate has no other significant CLs
pending. This avoids repeatedly introducing non-textual conflicts with
new code that adds `use` statements.

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

Change-Id: Ibe8274ab3494d3562e3bc79bfd88193db88679c7
Reviewed-on: https://chromium-review.googlesource.com/1520071
Commit-Ready: David Tolnay <dtolnay@chromium.org>
Tested-by: David Tolnay <dtolnay@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: David Tolnay <dtolnay@chromium.org>
-rw-r--r--usb_util/Cargo.toml1
-rw-r--r--usb_util/src/hotplug.rs6
2 files changed, 4 insertions, 3 deletions
diff --git a/usb_util/Cargo.toml b/usb_util/Cargo.toml
index 1ab1cf2..fab07d6 100644
--- a/usb_util/Cargo.toml
+++ b/usb_util/Cargo.toml
@@ -2,6 +2,7 @@
 name = "usb_util"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
+edition = "2018"
 build = "build.rs"
 
 [features]
diff --git a/usb_util/src/hotplug.rs b/usb_util/src/hotplug.rs
index d35a757..e131ab9 100644
--- a/usb_util/src/hotplug.rs
+++ b/usb_util/src/hotplug.rs
@@ -5,9 +5,9 @@
 use std::os::raw::{c_int, c_void};
 use std::sync::Arc;
 
-use bindings;
-use libusb_context::LibUsbContextInner;
-use libusb_device::LibUsbDevice;
+use crate::bindings;
+use crate::libusb_context::LibUsbContextInner;
+use crate::libusb_device::LibUsbDevice;
 
 #[derive(PartialEq)]
 pub enum HotplugEvent {