External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-01 02:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

pci, ch-remote, vmm: Replace simple match blocks with matches!

Browse Source 
This is a new clippy check introduced in 1.47 which requires the use of
the matches!() macro for simple match blocks that return a boolean.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-10-08 15:26:16 +01:00 committed by Sebastien Boeuf
parent 2fac41f154
commit bb5b9584d2
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pci/src/vfio.rs
View File

@ -714,20 +714,17 @@ impl PciDevice for VfioPciDevice {
// Is this an IO BAR?
let io_bar = if bar_id != VFIO_PCI_ROM_REGION_INDEX {
match lsb_flag & PCI_CONFIG_IO_BAR {
PCI_CONFIG_IO_BAR => true,
_ => false,
}
matches!(lsb_flag & PCI_CONFIG_IO_BAR, PCI_CONFIG_IO_BAR)
} else {
false
};
// Is this a 64-bit BAR?
let is_64bit_bar = if bar_id != VFIO_PCI_ROM_REGION_INDEX {
match lsb_flag & PCI_CONFIG_MEMORY_BAR_64BIT {
PCI_CONFIG_MEMORY_BAR_64BIT => true,
_ => false,
}
matches!(
lsb_flag & PCI_CONFIG_MEMORY_BAR_64BIT,
PCI_CONFIG_MEMORY_BAR_64BIT
)
} else {
false
};

8
src/bin/ch-remote.rs
View File

@ -96,10 +96,10 @@ impl StatusCode {
}
fn is_server_error(self) -> bool {
match self {
StatusCode::OK | StatusCode::Continue | StatusCode::NoContent => false,
_ => true,
}
!matches!(
self,
StatusCode::OK | StatusCode::Continue | StatusCode::NoContent
)
}
}

5
vmm/src/config.rs
View File

@ -1088,10 +1088,7 @@ pub enum ConsoleOutputMode {
impl ConsoleOutputMode {
pub fn input_enabled(&self) -> bool {
match self {
ConsoleOutputMode::Tty => true,
_ => false,
}
matches!(self, ConsoleOutputMode::Tty)
}
}