summary refs log tree commit diff
path: root/vm_control
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2019-04-12 12:18:35 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-04-15 02:06:07 -0700
commit633426a8fc20a5eef402e159d53228aae13bbaa5 (patch)
treeddc7e53a2baeebd3fdd15d724107e7f018de4dc4 /vm_control
parent62041f041956a2ccfdd0a340b65b8a2cb0749655 (diff)
downloadcrosvm-633426a8fc20a5eef402e159d53228aae13bbaa5.tar
crosvm-633426a8fc20a5eef402e159d53228aae13bbaa5.tar.gz
crosvm-633426a8fc20a5eef402e159d53228aae13bbaa5.tar.bz2
crosvm-633426a8fc20a5eef402e159d53228aae13bbaa5.tar.lz
crosvm-633426a8fc20a5eef402e159d53228aae13bbaa5.tar.xz
crosvm-633426a8fc20a5eef402e159d53228aae13bbaa5.tar.zst
crosvm-633426a8fc20a5eef402e159d53228aae13bbaa5.zip
edition: Fill in macro imports
Macros were previously imported through `#[macro_use] extern crate`,
which is basically a glob import of all macros from the crate. As of
2018 edition of Rust, `extern crate` is no longer required and macros
are imported individually like any other item from a dependency. This CL
fills in all the appropriate macro imports that will allow us to remove
our use of `extern crate` in a subsequent CL.

TEST=cargo check --all-features --tests
TEST=kokoro

Change-Id: If2ec08b06b743abf5f62677c6a9927c3d5d90a54
Reviewed-on: https://chromium-review.googlesource.com/1565546
Commit-Ready: David Tolnay <dtolnay@chromium.org>
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 'vm_control')
-rw-r--r--vm_control/src/lib.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/vm_control/src/lib.rs b/vm_control/src/lib.rs
index 6573c9a..79d95ed 100644
--- a/vm_control/src/lib.rs
+++ b/vm_control/src/lib.rs
@@ -30,7 +30,8 @@ use kvm::{Datamatch, IoeventAddress, Vm};
 use msg_socket::{MsgOnSocket, MsgReceiver, MsgResult, MsgSender, MsgSocket};
 use resources::{GpuMemoryDesc, SystemAllocator};
 use sys_util::{
-    net::UnixSeqpacket, Error as SysError, EventFd, GuestAddress, MemoryMapping, MmapError, Result,
+    error, net::UnixSeqpacket, Error as SysError, EventFd, GuestAddress, MemoryMapping, MmapError,
+    Result,
 };
 
 /// A file descriptor either borrowed or owned by this.