External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-01 11:05:46 +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? // Is this an IO BAR?
let io_bar = if bar_id != VFIO_PCI_ROM_REGION_INDEX { let io_bar = if bar_id != VFIO_PCI_ROM_REGION_INDEX {
match lsb_flag & PCI_CONFIG_IO_BAR { matches!(lsb_flag & PCI_CONFIG_IO_BAR, PCI_CONFIG_IO_BAR)
PCI_CONFIG_IO_BAR => true,
_ => false,
}
} else { } else {
false false
}; };
// Is this a 64-bit BAR? // Is this a 64-bit BAR?
let is_64bit_bar = if bar_id != VFIO_PCI_ROM_REGION_INDEX { let is_64bit_bar = if bar_id != VFIO_PCI_ROM_REGION_INDEX {
match lsb_flag & PCI_CONFIG_MEMORY_BAR_64BIT { matches!(
PCI_CONFIG_MEMORY_BAR_64BIT => true, lsb_flag & PCI_CONFIG_MEMORY_BAR_64BIT,
_ => false, PCI_CONFIG_MEMORY_BAR_64BIT
} )
} else { } else {
false false
}; };

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

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

5
vmm/src/config.rs
View File

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