mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 10:10:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clippy: Resolve single_match

Browse source 
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>
This commit is contained in:
David Tolnay 2019-04-12 19:35:23 -07:00 committed by chrome-bot
parent 5e73d9090a
commit 9f2929479b
7 changed files with 44 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/clippy
View file

@ -16,7 +16,6 @@ SUPPRESS=(
let_unit_value
question_mark
range_plus_one
single_match
string_lit_as_bytes
toplevel_ref_arg
unit_arg

17
devices/src/usb/host_backend/context.rs
View file

@ -129,32 +129,29 @@ struct PollfdChangeHandler {
impl LibUsbPollfdChangeHandler for PollfdChangeHandler {
fn add_poll_fd(&self, fd: RawFd, events: c_short) {
match self.event_loop.add_event(
if let Err(e) = self.event_loop.add_event(
&MaybeOwnedFd::Borrowed(fd),
WatchingEvents::new(events as u32),
self.event_handler.clone(),
) {
Err(e) => error!("cannot add event to event loop: {}", e),
Ok(_) => {}
error!("cannot add event to event loop: {}", e);
}
}
fn remove_poll_fd(&self, fd: RawFd) {
if let Some(h) = self.event_handler.upgrade() {
match h.on_event() {
Ok(()) => {}
Err(e) => error!("cannot handle event: {:?}", e),
if let Err(e) = h.on_event() {
error!("cannot handle event: {:?}", e);
}
}
match self
if let Err(e) = self
.event_loop
.remove_event_for_fd(&MaybeOwnedFd::Borrowed(fd))
{
Ok(_) => {}
Err(e) => error!(
error!(
"failed to remove poll change handler from event loop: {}",
e
),
);
}
}
}

35
devices/src/usb/host_backend/hotplug.rs
View file

@ -21,26 +21,25 @@ impl HotplugHandler {
impl UsbHotplugHandler for HotplugHandler {
fn hotplug_event(&self, device: LibUsbDevice, event: HotplugEvent) {
match event {
HotplugEvent::DeviceLeft => {
let bus = device.get_bus_number();
let address = device.get_address();
let descriptor = match device.get_device_descriptor() {
Ok(d) => d,
Err(e) => {
error!("cannot get device descriptor: {:?}", e);
return;
}
};
let vid = descriptor.idVendor;
let pid = descriptor.idProduct;
if event != HotplugEvent::DeviceLeft {
return;
}
if let Err(e) = self.hub.try_detach(bus, address, vid, pid) {
error!("device left event triggered failed detach from hub: {}", e);
return;
}
let bus = device.get_bus_number();
let address = device.get_address();
let descriptor = match device.get_device_descriptor() {
Ok(d) => d,
Err(e) => {
error!("cannot get device descriptor: {:?}", e);
return;
}
_ => {}
};
let vid = descriptor.idVendor;
let pid = descriptor.idProduct;
if let Err(e) = self.hub.try_detach(bus, address, vid, pid) {
error!("device left event triggered failed detach from hub: {}", e);
return;
}
}
}

23
devices/src/usb/xhci/ring_buffer.rs
View file

@ -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,

7
kvm/src/lib.rs
View file

@ -842,10 +842,9 @@ impl Vm {
if do_datamatch {
flags |= 1 << kvm_ioeventfd_flag_nr_datamatch
}
match addr {
IoeventAddress::Pio(_) => flags |= 1 << kvm_ioeventfd_flag_nr_pio,
_ => {}
};
if let IoeventAddress::Pio(_) = addr {
flags |= 1 << kvm_ioeventfd_flag_nr_pio;
}
let ioeventfd = kvm_ioeventfd {
datamatch: datamatch_value,
len: datamatch_len,

9
qcow/src/qcow.rs
View file

@ -549,13 +549,12 @@ impl QcowFile {
let mut cluster_addr = 0;
while cluster_addr < file_size {
match self
let cluster_refcount = self
.refcounts
.get_cluster_refcount(&mut self.raw_file, cluster_addr)
.map_err(Error::GettingRefcount)?
{
0 => return Ok(Some(cluster_addr)),
_ => (),
.map_err(Error::GettingRefcount)?;
if cluster_refcount == 0 {
return Ok(Some(cluster_addr));
}
cluster_addr += cluster_size;
}

9
src/plugin/vcpu.rs
View file

@ -256,12 +256,9 @@ impl<'a> VcpuRunData<'a> {
}
fn copy_from_slice(&mut self, data: &[u8]) {
match self {
VcpuRunData::Read(s) => {
let copy_size = min(s.len(), data.len());
s.copy_from_slice(&data[..copy_size]);
}
_ => {}
if let VcpuRunData::Read(s) = self {
let copy_size = min(s.len(), data.len());
s.copy_from_slice(&data[..copy_size]);
}
}
}