diff options
author | David Tolnay <dtolnay@chromium.org> | 2019-04-12 12:18:35 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-15 02:06:07 -0700 |
commit | 633426a8fc20a5eef402e159d53228aae13bbaa5 (patch) | |
tree | ddc7e53a2baeebd3fdd15d724107e7f018de4dc4 /src/plugin | |
parent | 62041f041956a2ccfdd0a340b65b8a2cb0749655 (diff) | |
download | crosvm-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 'src/plugin')
-rw-r--r-- | src/plugin/mod.rs | 7 | ||||
-rw-r--r-- | src/plugin/process.rs | 2 | ||||
-rw-r--r-- | src/plugin/vcpu.rs | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/plugin/mod.rs b/src/plugin/mod.rs index f37f2eb..60a50da 100644 --- a/src/plugin/mod.rs +++ b/src/plugin/mod.rs @@ -29,9 +29,10 @@ use io_jail::{self, Minijail}; use kvm::{Datamatch, IoeventAddress, Kvm, Vcpu, VcpuExit, Vm}; use net_util::{Error as TapError, Tap, TapT}; use sys_util::{ - block_signal, clear_signal, drop_capabilities, getegid, geteuid, register_signal_handler, - validate_raw_fd, Error as SysError, EventFd, GuestMemory, Killable, MmapError, PollContext, - PollToken, Result as SysResult, SignalFd, SignalFdError, SIGRTMIN, + block_signal, clear_signal, drop_capabilities, error, getegid, geteuid, info, + register_signal_handler, validate_raw_fd, warn, Error as SysError, EventFd, GuestMemory, + Killable, MmapError, PollContext, PollToken, Result as SysResult, SignalFd, SignalFdError, + SIGRTMIN, }; use self::process::*; diff --git a/src/plugin/process.rs b/src/plugin/process.rs index b249cea..6b05bac 100644 --- a/src/plugin/process.rs +++ b/src/plugin/process.rs @@ -28,7 +28,7 @@ use kvm_sys::{kvm_clock_data, kvm_ioapic_state, kvm_pic_state, kvm_pit_state2}; use protos::plugin::*; use sync::Mutex; use sys_util::{ - Error as SysError, EventFd, GuestAddress, Killable, MemoryMapping, Result as SysResult, + error, Error as SysError, EventFd, GuestAddress, Killable, MemoryMapping, Result as SysResult, ScmSocket, SharedMemory, SIGRTMIN, }; diff --git a/src/plugin/vcpu.rs b/src/plugin/vcpu.rs index 1e6b782..307e1a0 100644 --- a/src/plugin/vcpu.rs +++ b/src/plugin/vcpu.rs @@ -23,6 +23,7 @@ use kvm_sys::{ }; use protos::plugin::*; use sync::Mutex; +use sys_util::error; use super::*; |