diff options
author | David Tolnay <dtolnay@chromium.org> | 2019-04-12 19:22:33 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-17 17:22:53 -0700 |
commit | 5fb3f5151731df314637ef82976367db2df14e66 (patch) | |
tree | cfefd7ab6a6f99383c0585f7005ab01bfc586009 /devices/src/virtio | |
parent | 56c2d3631c3125b02479dc0d3b2b488fb3363b65 (diff) | |
download | crosvm-5fb3f5151731df314637ef82976367db2df14e66.tar crosvm-5fb3f5151731df314637ef82976367db2df14e66.tar.gz crosvm-5fb3f5151731df314637ef82976367db2df14e66.tar.bz2 crosvm-5fb3f5151731df314637ef82976367db2df14e66.tar.lz crosvm-5fb3f5151731df314637ef82976367db2df14e66.tar.xz crosvm-5fb3f5151731df314637ef82976367db2df14e66.tar.zst crosvm-5fb3f5151731df314637ef82976367db2df14e66.zip |
clippy: Resolve redundant_closure
TEST=bin/clippy Change-Id: Id4f38956d788e4402df164df03e80c4b487b1ad6 Reviewed-on: https://chromium-review.googlesource.com/1566745 Commit-Ready: David Tolnay <dtolnay@chromium.org> Tested-by: David Tolnay <dtolnay@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Diffstat (limited to 'devices/src/virtio')
-rw-r--r-- | devices/src/virtio/gpu/backend.rs | 2 | ||||
-rw-r--r-- | devices/src/virtio/input/event_source.rs | 2 | ||||
-rw-r--r-- | devices/src/virtio/input/mod.rs | 2 | ||||
-rw-r--r-- | devices/src/virtio/virtio_pci_device.rs | 12 |
4 files changed, 9 insertions, 9 deletions
diff --git a/devices/src/virtio/gpu/backend.rs b/devices/src/virtio/gpu/backend.rs index 93e3ce6..bee1de4 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 56bb54a..a92dc83 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 95c4ab7..5a751e2 100644 --- a/devices/src/virtio/input/mod.rs +++ b/devices/src/virtio/input/mod.rs @@ -460,7 +460,7 @@ impl<T: EventSource> Worker<T> { } 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 c07c96d..725beda 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(()) |