summary refs log tree commit diff
path: root/devices/src/usb
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2019-04-12 19:46:44 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-04-17 17:22:55 -0700
commit2b82fbbedaf774e623221d1e599d6236cb3d4945 (patch)
tree8c2ca640771d48f3c192474f1addaa8d5c24e493 /devices/src/usb
parent60ac43971ad6f48d998c48eec21814dc25b782db (diff)
downloadcrosvm-2b82fbbedaf774e623221d1e599d6236cb3d4945.tar
crosvm-2b82fbbedaf774e623221d1e599d6236cb3d4945.tar.gz
crosvm-2b82fbbedaf774e623221d1e599d6236cb3d4945.tar.bz2
crosvm-2b82fbbedaf774e623221d1e599d6236cb3d4945.tar.lz
crosvm-2b82fbbedaf774e623221d1e599d6236cb3d4945.tar.xz
crosvm-2b82fbbedaf774e623221d1e599d6236cb3d4945.tar.zst
crosvm-2b82fbbedaf774e623221d1e599d6236cb3d4945.zip
clippy: Resolve unneeded_field_pattern
TEST=bin/clippy

Change-Id: Ia0e0163441fafd4ce44fef7ebaa18d1cc947e20e
Reviewed-on: https://chromium-review.googlesource.com/1566891
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/usb')
-rw-r--r--devices/src/usb/host_backend/host_backend_device_provider.rs2
-rw-r--r--devices/src/usb/host_backend/utils.rs2
-rw-r--r--devices/src/usb/xhci/xhci_controller.rs14
3 files changed, 6 insertions, 12 deletions
diff --git a/devices/src/usb/host_backend/host_backend_device_provider.rs b/devices/src/usb/host_backend/host_backend_device_provider.rs
index 8aca33e..9e3f199 100644
--- a/devices/src/usb/host_backend/host_backend_device_provider.rs
+++ b/devices/src/usb/host_backend/host_backend_device_provider.rs
@@ -78,7 +78,7 @@ impl HostBackendDeviceProvider {
                 *self = HostBackendDeviceProvider::Started { inner };
                 Ok(())
             }
-            HostBackendDeviceProvider::Started { inner: _ } => {
+            HostBackendDeviceProvider::Started { .. } => {
                 error!("Host backend provider has already started");
                 Err(Error::BadBackendProviderState)
             }
diff --git a/devices/src/usb/host_backend/utils.rs b/devices/src/usb/host_backend/utils.rs
index 6ae0388..7d23bd4 100644
--- a/devices/src/usb/host_backend/utils.rs
+++ b/devices/src/usb/host_backend/utils.rs
@@ -31,7 +31,7 @@ pub fn update_transfer_state<T: UsbTransferBuffer>(
         XhciTransferState::Cancelling => {
             *state = XhciTransferState::Cancelled;
         }
-        XhciTransferState::Submitted { cancel_callback: _ } => {
+        XhciTransferState::Submitted { .. } => {
             *state = XhciTransferState::Completed;
         }
         _ => {
diff --git a/devices/src/usb/xhci/xhci_controller.rs b/devices/src/usb/xhci/xhci_controller.rs
index 3f2db74..03f2cfc 100644
--- a/devices/src/usb/xhci/xhci_controller.rs
+++ b/devices/src/usb/xhci/xhci_controller.rs
@@ -234,12 +234,8 @@ impl PciDevice for XhciController {
         if addr < bar0 || addr > bar0 + XHCI_BAR0_SIZE {
             return;
         }
-        match self.state {
-            XhciControllerState::Initialized {
-                ref mmio,
-                xhci: _,
-                fail_handle: _,
-            } => {
+        match &self.state {
+            XhciControllerState::Initialized { mmio, .. } => {
                 // Read bar would still work even if it's already failed.
                 mmio.read(addr - bar0, data);
             }
@@ -255,11 +251,9 @@ impl PciDevice for XhciController {
         if addr < bar0 || addr > bar0 + XHCI_BAR0_SIZE {
             return;
         }
-        match self.state {
+        match &self.state {
             XhciControllerState::Initialized {
-                ref mmio,
-                xhci: _,
-                ref fail_handle,
+                mmio, fail_handle, ..
             } => {
                 if !fail_handle.failed() {
                     mmio.write(addr - bar0, data);