dsg/vhost
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix clippy 0.1.66 warnings

Browse source 
Signed-off-by: Alyssa Ross <hi@alyssa.is>
This commit is contained in:
Alyssa Ross 2023-01-01 19:40:39 +00:00 • committed by Stefano Garzarella
parent 9ee9bfd889
commit 7a874476e8
6 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/vhost/src/vhost_user/connection.rs
View file

@ -637,7 +637,7 @@ mod tests {
#[test]
fn create_listener() {
let path = temp_path();
let listener = Listener::new(&path, true).unwrap();
let listener = Listener::new(path, true).unwrap();
assert!(listener.as_raw_fd() > 0);
}
@ -654,7 +654,7 @@ mod tests {
#[test]
fn accept_connection() {
let path = temp_path();
let listener = Listener::new(&path, true).unwrap();
let listener = Listener::new(path, true).unwrap();
listener.set_nonblocking(true).unwrap();
// accept on a fd without incoming connection

8
crates/vhost/src/vhost_user/master.rs
View file

@ -827,7 +827,7 @@ mod tests {
#[test]
fn test_features() {
let path = temp_path();
let (master, mut peer) = create_pair(&path);
let (master, mut peer) = create_pair(path);
master.set_owner().unwrap();
let (hdr, rfds) = peer.recv_header().unwrap();
@ -862,7 +862,7 @@ mod tests {
#[test]
fn test_protocol_features() {
let path = temp_path();
let (mut master, mut peer) = create_pair(&path);
let (mut master, mut peer) = create_pair(path);
master.set_owner().unwrap();
let (hdr, rfds) = peer.recv_header().unwrap();
@ -913,7 +913,7 @@ mod tests {
#[test]
fn test_master_set_config_negative() {
let path = temp_path();
let (mut master, _peer) = create_pair(&path);
let (mut master, _peer) = create_pair(path);
let buf = vec![0x0; MAX_MSG_SIZE + 1];
master
@ -958,7 +958,7 @@ mod tests {
fn create_pair2() -> (Master, Endpoint<MasterReq>) {
let path = temp_path();
let (master, peer) = create_pair(&path);
let (master, peer) = create_pair(path);
{
let mut node = master.node();

2
crates/vhost/src/vhost_user/master_req_handler.rs
View file

@ -336,7 +336,7 @@ impl<S: VhostUserMasterReqHandler> MasterReqHandler<S> {
let def_err = libc::EINVAL;
let val = match res {
Ok(n) => *n,
Err(e) => match &*e {
Err(e) => match e {
Error::ReqHandlerError(ioerr) => match ioerr.raw_os_error() {
Some(rawerr) => -rawerr as u64,
None => -def_err as u64,

2
crates/vhost/src/vhost_user/message.rs
View file

@ -624,7 +624,7 @@ impl VhostUserVringAddr {
}
/// Create a new instance from `VringConfigData`.
#[cfg_attr(feature = "cargo-clippy", allow(clippy::identity_conversion))]
#[cfg_attr(feature = "cargo-clippy", allow(clippy::useless_conversion))]
pub fn from_config_data(index: u32, config_data: &VringConfigData) -> Self {
let log_addr = config_data.log_addr.unwrap_or(0);
VhostUserVringAddr {

6
crates/vhost/src/vhost_user/mod.rs
View file

@ -267,7 +267,7 @@ mod tests {
fn test_set_owner() {
let slave_be = Arc::new(Mutex::new(DummySlaveReqHandler::new()));
let path = temp_path();
let (master, mut slave) = create_slave(&path, slave_be.clone());
let (master, mut slave) = create_slave(path, slave_be.clone());
assert!(!slave_be.lock().unwrap().owned);
master.set_owner().unwrap();
@ -284,7 +284,7 @@ mod tests {
let sbar = mbar.clone();
let path = temp_path();
let slave_be = Arc::new(Mutex::new(DummySlaveReqHandler::new()));
let (mut master, mut slave) = create_slave(&path, slave_be.clone());
let (mut master, mut slave) = create_slave(path, slave_be.clone());
thread::spawn(move || {
slave.handle_request().unwrap();
@ -328,7 +328,7 @@ mod tests {
let sbar = mbar.clone();
let path = temp_path();
let slave_be = Arc::new(Mutex::new(DummySlaveReqHandler::new()));
let (mut master, mut slave) = create_slave(&path, slave_be.clone());
let (mut master, mut slave) = create_slave(path, slave_be.clone());
thread::spawn(move || {
// set_own()

6
crates/vhost/src/vhost_user/slave_req_handler.rs
View file

@ -611,11 +611,7 @@ impl<S: VhostUserSlaveReqHandler> SlaveReqHandler<S> {
if size - mem::size_of::<VhostUserConfig>() != msg.size as usize {
return Err(Error::InvalidMessage);
}
let flags: VhostUserConfigFlags;
match VhostUserConfigFlags::from_bits(msg.flags) {
Some(val) => flags = val,
None => return Err(Error::InvalidMessage),
}
let flags = VhostUserConfigFlags::from_bits(msg.flags).ok_or(Error::InvalidMessage)?;
self.backend
.set_config(msg.offset, &buf[mem::size_of::<VhostUserConfig>()..], flags)