From 3638ae21f8adac992f88703af019f820b06f2a20 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 7 May 2021 13:18:51 -0700 Subject: [PATCH] Remove needless returns Fixes clippy warning "unneeded `return` statement". BUG=None TEST=bin/clippy Change-Id: Ib31ce9c31d4edccd9c3a518dfa3a07186124d259 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2885783 Tested-by: kokoro Commit-Queue: Daniel Verkamp Reviewed-by: Keiichi Watanabe --- bin/clippy | 1 - devices/src/pci/ac97.rs | 2 +- devices/src/virtio/gpu/udmabuf.rs | 2 +- devices/src/virtio/vhost/user/block.rs | 1 - devices/src/virtio/vhost/user/fs.rs | 1 - devices/src/virtio/vhost/user/net.rs | 1 - rutabaga_gfx/src/cross_domain/cross_domain.rs | 2 +- src/argument.rs | 8 +++----- 8 files changed, 6 insertions(+), 12 deletions(-) diff --git a/bin/clippy b/bin/clippy index bf695dde6c..f63db5b63c 100755 --- a/bin/clippy +++ b/bin/clippy @@ -37,7 +37,6 @@ SUPPRESS=( let_unit_value missing_safety_doc needless_range_loop - needless_return option_map_unit_fn question_mark range_plus_one diff --git a/devices/src/pci/ac97.rs b/devices/src/pci/ac97.rs index 74bc016d52..f77f296aa0 100644 --- a/devices/src/pci/ac97.rs +++ b/devices/src/pci/ac97.rs @@ -193,7 +193,7 @@ impl Ac97Dev { .map_err(|e| pci_device::Error::CreateViosClientFailed(e))?, ); let vios_audio = Self::new(mem, Ac97Backend::VIOS, server); - return Ok(vios_audio); + Ok(vios_audio) } #[cfg(not(any(target_os = "linux", target_os = "android")))] Err(pci_device::Error::CreateViosClientFailed( diff --git a/devices/src/virtio/gpu/udmabuf.rs b/devices/src/virtio/gpu/udmabuf.rs index e77ca23661..54bda52f84 100644 --- a/devices/src/virtio/gpu/udmabuf.rs +++ b/devices/src/virtio/gpu/udmabuf.rs @@ -80,7 +80,7 @@ fn memory_offset(mem: &GuestMemory, guest_addr: GuestAddress, len: u64) -> Udmab return Err(GuestMemoryError::InvalidGuestAddress(guest_addr)); } - return Ok(memfd_offset + map_offset); + Ok(memfd_offset + map_offset) }) .map_err(UdmabufError::InvalidOffset) } diff --git a/devices/src/virtio/vhost/user/block.rs b/devices/src/virtio/vhost/user/block.rs index f3b6abfbea..4abde436ed 100644 --- a/devices/src/virtio/vhost/user/block.rs +++ b/devices/src/virtio/vhost/user/block.rs @@ -161,7 +161,6 @@ impl VirtioDevice for Block { match worker_result { Err(e) => { error!("failed to spawn vhost-user virtio_blk worker: {}", e); - return; } Ok(join_handle) => { self.worker_thread = Some(join_handle); diff --git a/devices/src/virtio/vhost/user/fs.rs b/devices/src/virtio/vhost/user/fs.rs index 2e212b97ca..19e183db01 100644 --- a/devices/src/virtio/vhost/user/fs.rs +++ b/devices/src/virtio/vhost/user/fs.rs @@ -160,7 +160,6 @@ impl VirtioDevice for Fs { match worker_result { Err(e) => { error!("failed to spawn vhost-user virtio_fs worker: {}", e); - return; } Ok(join_handle) => { self.worker_thread = Some(join_handle); diff --git a/devices/src/virtio/vhost/user/net.rs b/devices/src/virtio/vhost/user/net.rs index fe3deccf48..d1355ffe4d 100644 --- a/devices/src/virtio/vhost/user/net.rs +++ b/devices/src/virtio/vhost/user/net.rs @@ -166,7 +166,6 @@ impl VirtioDevice for Net { match worker_result { Err(e) => { error!("failed to spawn virtio_net worker: {}", e); - return; } Ok(join_handle) => { self.worker_thread = Some(join_handle); diff --git a/rutabaga_gfx/src/cross_domain/cross_domain.rs b/rutabaga_gfx/src/cross_domain/cross_domain.rs index a7b3ac999b..6b73553b21 100644 --- a/rutabaga_gfx/src/cross_domain/cross_domain.rs +++ b/rutabaga_gfx/src/cross_domain/cross_domain.rs @@ -256,7 +256,7 @@ impl RutabagaContext for CrossDomainContext { impl RutabagaComponent for CrossDomain { fn get_capset_info(&self, _capset_id: u32) -> (u32, u32) { - return (0u32, size_of::() as u32); + (0u32, size_of::() as u32) } fn get_capset(&self, _capset_id: u32, _version: u32) -> Vec { diff --git a/src/argument.rs b/src/argument.rs index 64be18227e..ce87f8dc26 100644 --- a/src/argument.rs +++ b/src/argument.rs @@ -409,11 +409,9 @@ mod tests { fn request_help() { let arguments = [Argument::short_flag('h', "help", "Print help message.")]; - let match_res = set_arguments(["-h"].iter(), &arguments[..], |name, _| { - match name { - "help" => return Err(Error::PrintHelp), - _ => unreachable!(), - }; + let match_res = set_arguments(["-h"].iter(), &arguments[..], |name, _| match name { + "help" => Err(Error::PrintHelp), + _ => unreachable!(), }); match match_res { Err(Error::PrintHelp) => {}