diff options
author | David Tolnay <dtolnay@chromium.org> | 2019-04-12 19:35:23 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-17 17:22:54 -0700 |
commit | 9f2929479b23765629978e16914ed773d9304046 (patch) | |
tree | f9a8c2a7ddd68173ec6ebe798e66b2a38c612d0c /devices/src/usb/xhci/ring_buffer.rs | |
parent | 5e73d9090a823a2ec4098d824b19c45459567ba5 (diff) | |
download | crosvm-9f2929479b23765629978e16914ed773d9304046.tar crosvm-9f2929479b23765629978e16914ed773d9304046.tar.gz crosvm-9f2929479b23765629978e16914ed773d9304046.tar.bz2 crosvm-9f2929479b23765629978e16914ed773d9304046.tar.lz crosvm-9f2929479b23765629978e16914ed773d9304046.tar.xz crosvm-9f2929479b23765629978e16914ed773d9304046.tar.zst crosvm-9f2929479b23765629978e16914ed773d9304046.zip |
clippy: Resolve single_match
TEST=bin/clippy Change-Id: Iea0d3539b3ab587a2d97f676e1d9c7a239504308 Reviewed-on: https://chromium-review.googlesource.com/1566748 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/xhci/ring_buffer.rs')
-rw-r--r-- | devices/src/usb/xhci/ring_buffer.rs | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/devices/src/usb/xhci/ring_buffer.rs b/devices/src/usb/xhci/ring_buffer.rs index 2f66fa8..5e2c570 100644 --- a/devices/src/usb/xhci/ring_buffer.rs +++ b/devices/src/usb/xhci/ring_buffer.rs @@ -67,19 +67,16 @@ impl RingBuffer { pub fn dequeue_transfer_descriptor(&mut self) -> Result<Option<TransferDescriptor>> { let mut td: TransferDescriptor = TransferDescriptor::new(); while let Some(addressed_trb) = self.get_current_trb()? { - match addressed_trb.trb.trb_type() { - Ok(TrbType::Link) => { - let link_trb = addressed_trb - .trb - .cast::<LinkTrb>() - .map_err(Error::CastTrb)?; - self.dequeue_pointer = GuestAddress(link_trb.get_ring_segment_pointer()); - self.consumer_cycle_state = - self.consumer_cycle_state != link_trb.get_toggle_cycle_bit(); - continue; - } - _ => {} - }; + if let Ok(TrbType::Link) = addressed_trb.trb.trb_type() { + let link_trb = addressed_trb + .trb + .cast::<LinkTrb>() + .map_err(Error::CastTrb)?; + self.dequeue_pointer = GuestAddress(link_trb.get_ring_segment_pointer()); + self.consumer_cycle_state = + self.consumer_cycle_state != link_trb.get_toggle_cycle_bit(); + continue; + } self.dequeue_pointer = match self.dequeue_pointer.checked_add(size_of::<Trb>() as u64) { Some(addr) => addr, |