From 5d9cc6be151ea2a3436aba5a449563d8a1311efb Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Wed, 28 Jun 2023 15:09:15 +0100 Subject: [PATCH] use assert_matches instead of manual panics --- crates/matrix-sdk-crypto/src/verification/requests.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/crates/matrix-sdk-crypto/src/verification/requests.rs b/crates/matrix-sdk-crypto/src/verification/requests.rs index b6c7dba6a..e7d11ee37 100644 --- a/crates/matrix-sdk-crypto/src/verification/requests.rs +++ b/crates/matrix-sdk-crypto/src/verification/requests.rs @@ -1697,18 +1697,15 @@ mod tests { // the outgoing message should target bob's device specifically { - let OutgoingVerificationRequest::ToDevice(to_device_request) = &outgoing_request else { - panic!("Not a to-device message"); - }; + let to_device_request = + assert_matches!(&outgoing_request, OutgoingVerificationRequest::ToDevice(r) => r); assert_eq!(to_device_request.messages.len(), 1); let device_ids: Vec<&DeviceIdOrAllDevices> = to_device_request.messages.values().next().unwrap().keys().collect(); assert_eq!(device_ids.len(), 1); - let DeviceIdOrAllDevices::DeviceId(device_id) = device_ids[0] else { - panic!("Not a device id"); - }; + let device_id = assert_matches!(device_ids[0], DeviceIdOrAllDevices::DeviceId(r) => r); assert_eq!(device_id, bob_device.device_id()); }