From 70f9fea1c358683858f0d1dce77c3c4825a476bd Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Tue, 19 Oct 2021 15:01:42 +0100 Subject: [PATCH] hypervisor: aarch64: Use assert!() rather than if+panic As identified by the new beta clippy. Signed-off-by: Rob Bradford --- hypervisor/src/kvm/aarch64/mod.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hypervisor/src/kvm/aarch64/mod.rs b/hypervisor/src/kvm/aarch64/mod.rs index 927a244e8..1adce1fa4 100644 --- a/hypervisor/src/kvm/aarch64/mod.rs +++ b/hypervisor/src/kvm/aarch64/mod.rs @@ -115,9 +115,13 @@ pub fn is_system_register(regid: u64) -> bool { } let size = regid & KVM_REG_SIZE_MASK; - if size != KVM_REG_SIZE_U32 && size != KVM_REG_SIZE_U64 { - panic!("Unexpected register size for system register {}", size); - } + + assert!( + !(size != KVM_REG_SIZE_U32 && size != KVM_REG_SIZE_U64), + "Unexpected register size for system register {}", + size + ); + true }