From 5fb3f5151731df314637ef82976367db2df14e66 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 12 Apr 2019 19:22:33 -0700 Subject: [PATCH] clippy: Resolve redundant_closure TEST=bin/clippy Change-Id: Id4f38956d788e4402df164df03e80c4b487b1ad6 Reviewed-on: https://chromium-review.googlesource.com/1566745 Commit-Ready: David Tolnay Tested-by: David Tolnay Tested-by: kokoro Reviewed-by: Daniel Verkamp --- bin/clippy | 1 - devices/src/virtio/gpu/backend.rs | 2 +- devices/src/virtio/input/event_source.rs | 2 +- devices/src/virtio/input/mod.rs | 2 +- devices/src/virtio/virtio_pci_device.rs | 12 ++++++------ src/linux.rs | 2 +- src/main.rs | 4 ++-- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/bin/clippy b/bin/clippy index cd0ead9011..08e33289f1 100755 --- a/bin/clippy +++ b/bin/clippy @@ -16,7 +16,6 @@ SUPPRESS=( let_unit_value question_mark range_plus_one - redundant_closure redundant_pattern_matching single_match string_lit_as_bytes diff --git a/devices/src/virtio/gpu/backend.rs b/devices/src/virtio/gpu/backend.rs index 93e3ce619c..bee1de45a5 100644 --- a/devices/src/virtio/gpu/backend.rs +++ b/devices/src/virtio/gpu/backend.rs @@ -367,7 +367,7 @@ impl Backend { .get(&id) .and_then(|resource| resource.buffer()) .and_then(|buffer| buffer.export_plane_fd(0).ok()) - .map(|fd| ResourceResponse::Resource(fd)) + .map(ResourceResponse::Resource) .unwrap_or(ResourceResponse::Invalid), }; diff --git a/devices/src/virtio/input/event_source.rs b/devices/src/virtio/input/event_source.rs index 56bb54afde..a92dc8359a 100644 --- a/devices/src/virtio/input/event_source.rs +++ b/devices/src/virtio/input/event_source.rs @@ -143,7 +143,7 @@ where let read = self .source .read(&mut self.read_buffer.buffer[self.read_idx..]) - .map_err(|e| InputError::EventsReadError(e))?; + .map_err(InputError::EventsReadError)?; let buff_size = read + self.read_idx; for evt_slice in self.read_buffer.buffer[..buff_size].chunks_exact(input_event::EVENT_SIZE) diff --git a/devices/src/virtio/input/mod.rs b/devices/src/virtio/input/mod.rs index 95c4ab739b..5a751e2c78 100644 --- a/devices/src/virtio/input/mod.rs +++ b/devices/src/virtio/input/mod.rs @@ -460,7 +460,7 @@ impl Worker { } else { self.guest_memory .write_from_memory(avail_desc.addr, &mut self.event_source, len) - .map_err(|e| InputError::EventsWriteError(e))?; + .map_err(InputError::EventsWriteError)?; } used_desc_heads[used_count] = (avail_desc.index, len); diff --git a/devices/src/virtio/virtio_pci_device.rs b/devices/src/virtio/virtio_pci_device.rs index c07c96d505..725bedaaf3 100644 --- a/devices/src/virtio/virtio_pci_device.rs +++ b/devices/src/virtio/virtio_pci_device.rs @@ -250,7 +250,7 @@ impl VirtioPciDevice { ); self.config_regs .add_capability(&common_cap) - .map_err(|e| PciDeviceError::CapabilitiesSetup(e))?; + .map_err(PciDeviceError::CapabilitiesSetup)?; let isr_cap = VirtioPciCap::new( PciCapabilityType::IsrConfig, @@ -260,7 +260,7 @@ impl VirtioPciDevice { ); self.config_regs .add_capability(&isr_cap) - .map_err(|e| PciDeviceError::CapabilitiesSetup(e))?; + .map_err(PciDeviceError::CapabilitiesSetup)?; // TODO(dgreid) - set based on device's configuration size? let device_cap = VirtioPciCap::new( @@ -271,7 +271,7 @@ impl VirtioPciDevice { ); self.config_regs .add_capability(&device_cap) - .map_err(|e| PciDeviceError::CapabilitiesSetup(e))?; + .map_err(PciDeviceError::CapabilitiesSetup)?; let notify_cap = VirtioPciNotifyCap::new( PciCapabilityType::NotifyConfig, @@ -282,13 +282,13 @@ impl VirtioPciDevice { ); self.config_regs .add_capability(¬ify_cap) - .map_err(|e| PciDeviceError::CapabilitiesSetup(e))?; + .map_err(PciDeviceError::CapabilitiesSetup)?; //TODO(dgreid) - How will the configuration_cap work? let configuration_cap = VirtioPciCap::new(PciCapabilityType::PciConfig, 0, 0, 0); self.config_regs .add_capability(&configuration_cap) - .map_err(|e| PciDeviceError::CapabilitiesSetup(e))?; + .map_err(PciDeviceError::CapabilitiesSetup)?; self.settings_bar = settings_bar; Ok(()) @@ -372,7 +372,7 @@ impl PciDevice for VirtioPciDevice { for cap in self.device.get_device_caps() { self.config_regs .add_capability(&*cap) - .map_err(|e| PciDeviceError::CapabilitiesSetup(e))?; + .map_err(PciDeviceError::CapabilitiesSetup)?; } Ok(()) diff --git a/src/linux.rs b/src/linux.rs index fcfcf94385..7ece6e39cd 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -1087,7 +1087,7 @@ pub fn run_config(cfg: Config) -> Result<()> { } let (usb_control_socket, usb_provider) = - HostBackendDeviceProvider::new().map_err(|e| Error::CreateUsbProvider(e))?; + HostBackendDeviceProvider::new().map_err(Error::CreateUsbProvider)?; // Masking signals is inherently dangerous, since this can persist across clones/execs. Do this // before any jailed devices have been spawned, so that we can catch any of them that fail very // quickly. diff --git a/src/main.rs b/src/main.rs index c8cb2ea22f..9906e47739 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1047,7 +1047,7 @@ fn raw_fd_from_path(path: &Path) -> ModifyUsbResult { }) }, )?; - validate_raw_fd(raw_fd).map_err(|e| ModifyUsbError::FailedFdValidate(e)) + validate_raw_fd(raw_fd).map_err(ModifyUsbError::FailedFdValidate) } fn usb_attach(mut args: std::env::Args) -> ModifyUsbResult { @@ -1080,7 +1080,7 @@ fn usb_attach(mut args: std::env::Args) -> ModifyUsbResult { addr, vid, pid, - fd: usb_file.map(|f| MaybeOwnedFd::Owned(f)), + fd: usb_file.map(MaybeOwnedFd::Owned), }); let response = handle_request(&request, args).map_err(|_| ModifyUsbError::SocketFailed)?; match response {