Merge branch 'code_hygiene' into 'master'

Code hygiene

See merge request redox-os/drivers!72

ahcid/src/scheme.rs

@@ -1,6 +1,6 @@
 use std::collections::BTreeMap;
 use std::{cmp, str};
-use std::convert::{TryFrom, TryInto};
+use std::convert::{TryFrom};
 use std::fmt::Write;
 use std::io::prelude::*;
 use std::io::SeekFrom;

e1000d/src/device.rs

@@ -1,5 +1,5 @@
 use std::collections::BTreeMap;
-use std::{cmp, mem, ptr, slice, thread};
+use std::{cmp, mem, ptr, slice};
 
 use netutils::setcfg;
 use syscall::error::{Error, Result, EACCES, EBADF, EINVAL, EWOULDBLOCK};

pcid/src/driver_interface/mod.rs

@@ -1,4 +1,4 @@
-use std::fs::{File, OpenOptions};
+use std::fs::File;
 use std::io::prelude::*;
 use std::{env, io};
 

pcid/src/main.rs

@@ -5,9 +5,7 @@ use std::io::prelude::*;
 use std::os::unix::io::{FromRawFd, RawFd};
 use std::process::Command;
 use std::sync::{Arc, Mutex};
-use std::{env, io, i64, thread};
-
-use syscall::iopl;
+use std::{i64, thread};
 
 use structopt::StructOpt;
 use log::{error, info, warn, trace};

pcid/src/pci/bus.rs

@@ -1,4 +1,4 @@
-use super::{Pci, PciDev, CfgAccess};
+use super::{PciDev, CfgAccess};
 
 pub struct PciBus<'pci> {
     pub pci: &'pci dyn CfgAccess,

pcid/src/pci/msi.rs

@@ -105,7 +105,7 @@ impl MsiCapability {
     }
     pub fn set_multi_message_enable(&mut self, log_mme: u8) {
         let mut new_message_control = self.message_control() & (!Self::MC_MULTI_MESSAGE_ENABLE_MASK);
-        new_message_control |= (u16::from(log_mme) << Self::MC_MULTI_MESSAGE_ENABLE_SHIFT);
+        new_message_control |= u16::from(log_mme) << Self::MC_MULTI_MESSAGE_ENABLE_SHIFT;
         self.set_message_control(new_message_control);
     }
 

pcid/src/pcie/mod.rs

@@ -3,7 +3,6 @@ use std::collections::BTreeMap;
 use std::sync::{Arc, Mutex};
 
 use syscall::flag::PhysmapFlags;
-use syscall::io::Dma;
 
 use smallvec::SmallVec;