mirror of
https://chromium.googlesource.com/crosvm/crosvm
synced 2025-02-10 20:19:07 +00:00
clippy: Resolve while_let_loop
TEST=bin/clippy Change-Id: Iae447ec2c1b095286ab02cd153bd2daafe95fae1 Reviewed-on: https://chromium-review.googlesource.com/1566894 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>
This commit is contained in:
parent
967c2f2c9b
commit
e246836798
4 changed files with 9 additions and 30 deletions
|
@ -36,7 +36,6 @@ SUPPRESS=(
|
||||||
unneeded_field_pattern
|
unneeded_field_pattern
|
||||||
unused_unit
|
unused_unit
|
||||||
useless_format
|
useless_format
|
||||||
while_let_loop
|
|
||||||
|
|
||||||
# To be resolved or suppressed locally.
|
# To be resolved or suppressed locally.
|
||||||
cast_ptr_alignment
|
cast_ptr_alignment
|
||||||
|
|
|
@ -66,12 +66,7 @@ impl RingBuffer {
|
||||||
/// Dequeue next transfer descriptor from the transfer ring.
|
/// Dequeue next transfer descriptor from the transfer ring.
|
||||||
pub fn dequeue_transfer_descriptor(&mut self) -> Result<Option<TransferDescriptor>> {
|
pub fn dequeue_transfer_descriptor(&mut self) -> Result<Option<TransferDescriptor>> {
|
||||||
let mut td: TransferDescriptor = TransferDescriptor::new();
|
let mut td: TransferDescriptor = TransferDescriptor::new();
|
||||||
loop {
|
while let Some(addressed_trb) = self.get_current_trb()? {
|
||||||
let addressed_trb = match self.get_current_trb()? {
|
|
||||||
Some(t) => t,
|
|
||||||
None => break,
|
|
||||||
};
|
|
||||||
|
|
||||||
match addressed_trb.trb.trb_type() {
|
match addressed_trb.trb.trb_type() {
|
||||||
Ok(TrbType::Link) => {
|
Ok(TrbType::Link) => {
|
||||||
let link_trb = addressed_trb
|
let link_trb = addressed_trb
|
||||||
|
|
|
@ -570,26 +570,16 @@ impl Worker {
|
||||||
}
|
}
|
||||||
|
|
||||||
// All cursor commands go first because they have higher priority.
|
// All cursor commands go first because they have higher priority.
|
||||||
loop {
|
while let Some(desc) = self.state.process_cursor(&self.mem) {
|
||||||
match self.state.process_cursor(&self.mem) {
|
self.cursor_queue.add_used(&self.mem, desc.index, desc.len);
|
||||||
Some(ReturnDescriptor { index, len }) => {
|
signal_used = true;
|
||||||
self.cursor_queue.add_used(&self.mem, index, len);
|
|
||||||
signal_used = true;
|
|
||||||
}
|
|
||||||
None => break,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
self.state.fence_poll();
|
self.state.fence_poll();
|
||||||
|
|
||||||
loop {
|
while let Some(desc) = self.state.process_ctrl(&self.mem) {
|
||||||
match self.state.process_ctrl(&self.mem) {
|
self.ctrl_queue.add_used(&self.mem, desc.index, desc.len);
|
||||||
Some(ReturnDescriptor { index, len }) => {
|
signal_used = true;
|
||||||
self.ctrl_queue.add_used(&self.mem, index, len);
|
|
||||||
signal_used = true;
|
|
||||||
}
|
|
||||||
None => break,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Process the entire control queue before the resource bridge in case a resource is
|
// Process the entire control queue before the resource bridge in case a resource is
|
||||||
|
|
|
@ -785,13 +785,8 @@ impl Server {
|
||||||
let count = min(self.msize - header_size, readdir.count);
|
let count = min(self.msize - header_size, readdir.count);
|
||||||
let mut cursor = Cursor::new(Vec::with_capacity(count as usize));
|
let mut cursor = Cursor::new(Vec::with_capacity(count as usize));
|
||||||
|
|
||||||
loop {
|
while let Some(entry) = entries.peek() {
|
||||||
let byte_size = if let Some(entry) = entries.peek() {
|
let byte_size = entry.byte_size() as usize;
|
||||||
entry.byte_size() as usize
|
|
||||||
} else {
|
|
||||||
// No more entries.
|
|
||||||
break;
|
|
||||||
};
|
|
||||||
|
|
||||||
if cursor.get_ref().capacity() - cursor.get_ref().len() < byte_size {
|
if cursor.get_ref().capacity() - cursor.get_ref().len() < byte_size {
|
||||||
// No more room in the buffer.
|
// No more room in the buffer.
|
||||||
|
|
Loading…
Reference in a new issue