summary refs log tree commit diff
path: root/devices/src/virtio/wl.rs
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 /devices/src/virtio/wl.rs
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 'devices/src/virtio/wl.rs')
-rw-r--r--devices/src/virtio/wl.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/devices/src/virtio/wl.rs b/devices/src/virtio/wl.rs
index 4a6d59d..2352998 100644
--- a/devices/src/virtio/wl.rs
+++ b/devices/src/virtio/wl.rs
@@ -59,8 +59,10 @@ use data_model::*;
 use msg_socket::{MsgError, MsgReceiver, MsgSender};
 #[cfg(feature = "wl-dmabuf")]
 use resources::GpuMemoryDesc;
+#[cfg(feature = "wl-dmabuf")]
+use sys_util::ioctl_iow_nr;
 use sys_util::{
-    pipe, round_up_to_page_size, Error, EventFd, FileFlags, GuestAddress, GuestMemory,
+    error, pipe, round_up_to_page_size, warn, Error, EventFd, FileFlags, GuestAddress, GuestMemory,
     GuestMemoryError, PollContext, PollToken, Result, ScmSocket, SharedMemory,
 };