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>

6 files changed, 13 insertions, 9 deletions

diff --git a/src/linux.rs b/src/linux.rs
index 78e5740..730de9c 100644
--- a/src/linux.rs
+++ b/src/linux.rs
@@ -37,10 +37,10 @@ use remain::sorted;
 use sync::{Condvar, Mutex};
 use sys_util::net::{UnixSeqpacket, UnixSeqpacketListener, UnlinkUnixSeqpacketListener};
 use sys_util::{
-    self, block_signal, clear_signal, drop_capabilities, flock, get_blocked_signals, get_group_id,
-    get_user_id, getegid, geteuid, register_signal_handler, set_cpu_affinity, validate_raw_fd,
-    EventFd, FlockOperation, GuestMemory, Killable, PollContext, PollToken, SignalFd, Terminal,
-    TimerFd, SIGRTMIN,
+    self, block_signal, clear_signal, drop_capabilities, error, flock, get_blocked_signals,
+    get_group_id, get_user_id, getegid, geteuid, info, register_signal_handler, set_cpu_affinity,
+    validate_raw_fd, warn, EventFd, FlockOperation, GuestMemory, Killable, PollContext, PollToken,
+    SignalFd, Terminal, TimerFd, SIGRTMIN,
 };
 #[cfg(feature = "gpu-forward")]
 use sys_util::{GuestAddress, MemoryMapping, Protection};
diff --git a/src/main.rs b/src/main.rs
index c000ac8..b1d2cb2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -57,7 +57,8 @@ use std::time::Duration;
 use msg_socket::{MsgReceiver, MsgSender, MsgSocket};
 use qcow::QcowFile;
 use sys_util::{
-    getpid, kill_process_group, net::UnixSeqpacket, reap_child, syslog, validate_raw_fd,
+    debug, error, getpid, info, kill_process_group, net::UnixSeqpacket, reap_child, syslog,
+    validate_raw_fd, warn,
 };
 use vm_control::{
     MaybeOwnedFd, UsbControlCommand, UsbControlResult, VmControlRequestSocket, VmRequest,
diff --git a/src/panic_hook.rs b/src/panic_hook.rs
index 7f93d91..48cf0c5 100644
--- a/src/panic_hook.rs
+++ b/src/panic_hook.rs
@@ -11,6 +11,7 @@ use std::process::abort;
 use std::string::String;
 
 use libc::{close, dup, dup2, pipe2, O_NONBLOCK, STDERR_FILENO};
+use sys_util::error;
 
 // Opens a pipe and puts the write end into the stderr FD slot. On success, returns the read end of
 // the pipe and the old stderr as a pair of files.
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::*;