From 8924865c9ca57f0b8b7dd6f954339e1d58b9a059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Mon, 4 Jan 2021 17:39:40 +0100 Subject: [PATCH] crypto: Fix a couple of new clippy warnings. --- matrix_sdk_crypto/src/verification/sas/helpers.rs | 6 +++--- matrix_sdk_crypto/src/verification/sas/mod.rs | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/matrix_sdk_crypto/src/verification/sas/helpers.rs b/matrix_sdk_crypto/src/verification/sas/helpers.rs index 37974d14..2c35dd9c 100644 --- a/matrix_sdk_crypto/src/verification/sas/helpers.rs +++ b/matrix_sdk_crypto/src/verification/sas/helpers.rs @@ -597,9 +597,9 @@ mod test { fn proptest_decimals(bytes in prop::array::uniform5(0u8..)) { let (first, second, third) = bytes_to_decimal(bytes.to_vec()); - prop_assert!(first <= 9191 && first >= 1000); - prop_assert!(second <= 9191 && second >= 1000); - prop_assert!(third <= 9191 && third >= 1000); + prop_assert!((1000..=9191).contains(&first)); + prop_assert!((1000..=9191).contains(&second)); + prop_assert!((1000..=9191).contains(&third)); } } } diff --git a/matrix_sdk_crypto/src/verification/sas/mod.rs b/matrix_sdk_crypto/src/verification/sas/mod.rs index d6f1322f..ab99ca9a 100644 --- a/matrix_sdk_crypto/src/verification/sas/mod.rs +++ b/matrix_sdk_crypto/src/verification/sas/mod.rs @@ -695,11 +695,7 @@ impl InnerSas { } fn can_be_presented(&self) -> bool { - match self { - InnerSas::KeyRecieved(_) => true, - InnerSas::MacReceived(_) => true, - _ => false, - } + matches!(self, InnerSas::KeyRecieved(_) | InnerSas::MacReceived(_)) } fn is_done(&self) -> bool {