From 04a82c7be173b2068c4254ed4a129e24e9e3a2e4 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 24 Sep 2019 11:06:58 -0700 Subject: devices: vfio: fix clippy warnings Fix boxed_local, const_static_lifetime, useless_format, and redundant_closure clippy warnings in the VFIO code. This fixes all clippy warnings except a single instance of let_and_return in VfioPciDevice::keep_fds(), since that code is modified in an upcoming patch. BUG=None TEST=./build_test.py TEST=bin/clippy Change-Id: I548adbc6b92448fc0db82ed72214d73b0eabaf5c Signed-off-by: Daniel Verkamp Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1822697 Reviewed-by: Xiong Zhang Reviewed-by: Zach Reizner Tested-by: Xiong Zhang Tested-by: kokoro --- devices/src/vfio.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'devices/src/vfio.rs') diff --git a/devices/src/vfio.rs b/devices/src/vfio.rs index c5d3717..966085f 100644 --- a/devices/src/vfio.rs +++ b/devices/src/vfio.rs @@ -78,7 +78,7 @@ impl VfioContainer { .read(true) .write(true) .open("/dev/vfio/vfio") - .map_err(|e| VfioError::OpenContainer(e))?; + .map_err(VfioError::OpenContainer)?; Ok(VfioContainer { container }) } @@ -164,7 +164,7 @@ impl VfioGroup { .read(true) .write(true) .open(Path::new(&group_path)) - .map_err(|e| VfioError::OpenGroup(e))?; + .map_err(VfioError::OpenGroup)?; let mut group_status = vfio_group_status { argsz: mem::size_of::() as u32, @@ -217,7 +217,7 @@ impl VfioGroup { flags: 0, }; vm.create_device(&mut vfio_dev) - .map_err(|e| VfioError::CreateVfioKvmDevice(e))?; + .map_err(VfioError::CreateVfioKvmDevice)?; // Safe as we are the owner of vfio_dev.fd which is valid value. let vfio_dev_fd = unsafe { File::from_raw_fd(vfio_dev.fd as i32) }; -- cgit 1.4.1