summary refs log tree commit diff
path: root/devices
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-04-11 19:47:40 +0000
committerAlyssa Ross <hi@alyssa.is>2020-04-11 19:55:13 +0000
commitb1a657f905422a33447342944761f48632022faf (patch)
tree45db910ebdd0f84798463707a6264d8e320aa77c /devices
parent5ba2568bff628620aa993a8f64b9e1dcf25928f4 (diff)
downloadcrosvm-b1a657f905422a33447342944761f48632022faf.tar
crosvm-b1a657f905422a33447342944761f48632022faf.tar.gz
crosvm-b1a657f905422a33447342944761f48632022faf.tar.bz2
crosvm-b1a657f905422a33447342944761f48632022faf.tar.lz
crosvm-b1a657f905422a33447342944761f48632022faf.tar.xz
crosvm-b1a657f905422a33447342944761f48632022faf.tar.zst
crosvm-b1a657f905422a33447342944761f48632022faf.zip
crosvm: collapse simple boolean matches
Rust 1.42 introduces matches!(), which can be used to collapse simple
match statements like these.
Diffstat (limited to 'devices')
-rw-r--r--devices/src/pci/vfio_pci.rs5
-rw-r--r--devices/src/virtio/gpu/mod.rs5
2 files changed, 2 insertions, 8 deletions
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(_))
     }
 }