From b1a657f905422a33447342944761f48632022faf Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 11 Apr 2020 19:47:40 +0000 Subject: crosvm: collapse simple boolean matches Rust 1.42 introduces matches!(), which can be used to collapse simple match statements like these. --- devices/src/pci/vfio_pci.rs | 5 +---- devices/src/virtio/gpu/mod.rs | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'devices') diff --git a/devices/src/pci/vfio_pci.rs b/devices/src/pci/vfio_pci.rs index d1b6f2b..5c13d28 100644 --- a/devices/src/pci/vfio_pci.rs +++ b/devices/src/pci/vfio_pci.rs @@ -832,10 +832,7 @@ impl PciDevice for VfioPciDevice { low = self.config.read_config_dword(offset); let low_flag = low & 0xf; - let is_64bit = match low_flag & 0x4 { - 0x4 => true, - _ => false, - }; + let is_64bit = (low_flag & 0x4) == 0x4; if (low_flag & 0x1 == 0 || i == VFIO_PCI_ROM_REGION_INDEX) && low != 0 { let mut upper: u32 = 0xffffffff; if is_64bit { diff --git a/devices/src/virtio/gpu/mod.rs b/devices/src/virtio/gpu/mod.rs index e8e7f4a..fec2904 100644 --- a/devices/src/virtio/gpu/mod.rs +++ b/devices/src/virtio/gpu/mod.rs @@ -977,10 +977,7 @@ impl DisplayBackend { } fn is_x(&self) -> bool { - match self { - DisplayBackend::X(_) => true, - _ => false, - } + matches!(self, DisplayBackend::X(_)) } } -- cgit 1.4.1