Commit 31bae743 authored by Jeremy Soller's avatar Jeremy Soller

Merge branch 'code_hygiene' into 'master'

Code hygiene

See merge request !72
parents be101621 6018b6fc
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;
......
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};
......
use std::fs::{File, OpenOptions};
use std::fs::File;
use std::io::prelude::*;
use std::{env, io};
......
......@@ -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};
......
use super::{Pci, PciDev, CfgAccess};
use super::{PciDev, CfgAccess};
pub struct PciBus<'pci> {
pub pci: &'pci dyn CfgAccess,
......
......@@ -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);
}
......
......@@ -3,7 +3,6 @@ use std::collections::BTreeMap;
use std::sync::{Arc, Mutex};
use syscall::flag::PhysmapFlags;
use syscall::io::Dma;
use smallvec::SmallVec;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment