4 files changed, 5 insertions, 5 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 23fce21..7343025 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,7 @@
 name = "crosvm"
 version = "0.1.0"
 authors = ["The Chromium OS Authors"]
+edition = "2018"
 
 [profile.release]
 panic = 'abort'
diff --git a/src/plugin/mod.rs b/src/plugin/mod.rs
index 4ec7a41..052b057 100644
--- a/src/plugin/mod.rs
+++ b/src/plugin/mod.rs
@@ -33,10 +33,9 @@ use sys_util::{
     PollToken, Result as SysResult, SignalFd, SignalFdError, SIGRTMIN,
 };
 
-use Config;
-
 use self::process::*;
 use self::vcpu::*;
+use crate::Config;
 
 const MAX_DATAGRAM_SIZE: usize = 4096;
 const MAX_VCPU_DATAGRAM_SIZE: usize = 0x40000;
@@ -381,7 +380,7 @@ pub fn run_vcpus(
                                         }
                                         vcpu_plugin.io_write(port as u64, &data[..size], &vcpu);
                                     }
-                                    VcpuExit::MmioRead { address, mut size } => {
+                                    VcpuExit::MmioRead { address, size } => {
                                         let mut data = [0; 8];
                                         vcpu_plugin.mmio_read(
                                             address as u64,
diff --git a/src/plugin/process.rs b/src/plugin/process.rs
index 2df9284..1ab77cb 100644
--- a/src/plugin/process.rs
+++ b/src/plugin/process.rs
@@ -22,10 +22,10 @@ use libc::{pid_t, waitpid, EINVAL, ENODATA, ENOTTY, WEXITSTATUS, WIFEXITED, WNOH
 use protobuf;
 use protobuf::Message;
 
+use ::plugin_proto::*;
 use io_jail::Minijail;
 use kvm::{dirty_log_bitmap_size, Datamatch, IoeventAddress, IrqRoute, IrqSource, PicId, Vm};
 use kvm_sys::{kvm_clock_data, kvm_ioapic_state, kvm_pic_state, kvm_pit_state2};
-use plugin_proto::*;
 use sync::Mutex;
 use sys_util::{
     Error as SysError, EventFd, GuestAddress, Killable, MemoryMapping, Result as SysResult,
diff --git a/src/plugin/vcpu.rs b/src/plugin/vcpu.rs
index c2350a6..32e0f81 100644
--- a/src/plugin/vcpu.rs
+++ b/src/plugin/vcpu.rs
@@ -15,13 +15,13 @@ use libc::{EINVAL, ENOENT, ENOTTY, EPERM, EPIPE, EPROTO};
 use protobuf;
 use protobuf::Message;
 
+use ::plugin_proto::*;
 use data_model::DataInit;
 use kvm::{CpuId, Vcpu};
 use kvm_sys::{
     kvm_debugregs, kvm_fpu, kvm_lapic_state, kvm_mp_state, kvm_msr_entry, kvm_msrs, kvm_regs,
     kvm_sregs, kvm_vcpu_events, kvm_xcrs, KVM_CPUID_FLAG_SIGNIFCANT_INDEX,
 };
-use plugin_proto::*;
 use sync::Mutex;
 
 use super::*;