From 00357b3883c6286d8b8b21561f39958d98a24ed0 Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Sun, 10 May 2026 16:09:04 +0200
Subject: [PATCH] refactor: use some more let..else

---
 src/imex/transfer.rs                 | 14 ++++++--------
 src/receive_imf/receive_imf_tests.rs | 12 +++++-------
 src/test_utils.rs                    |  4 +---
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/imex/transfer.rs b/src/imex/transfer.rs
index 67206abe9..7f00d51c6 100644
--- a/src/imex/transfer.rs
+++ b/src/imex/transfer.rs
@@ -427,18 +427,16 @@ mod tests {
         let self_chat = ctx1.get_self_chat().await;
         let msgs = get_chat_msgs(&ctx1, self_chat.id).await.unwrap();
         assert_eq!(msgs.len(), 2);
-        let msgid = match msgs.first().unwrap() {
-            ChatItem::Message { msg_id } => msg_id,
-            _ => panic!("wrong chat item"),
+        let ChatItem::Message { msg_id } = msgs.first().unwrap() else {
+            panic!("wrong chat item");
         };
-        let msg = Message::load_from_db(&ctx1, *msgid).await.unwrap();
+        let msg = Message::load_from_db(&ctx1, *msg_id).await.unwrap();
         let text = msg.get_text();
         assert_eq!(text, "hi there");
-        let msgid = match msgs.get(1).unwrap() {
-            ChatItem::Message { msg_id } => msg_id,
-            _ => panic!("wrong chat item"),
+        let ChatItem::Message { msg_id } = msgs.get(1).unwrap() else {
+            panic!("wrong chat item");
         };
-        let msg = Message::load_from_db(&ctx1, *msgid).await.unwrap();
+        let msg = Message::load_from_db(&ctx1, *msg_id).await.unwrap();
 
         let path = msg.get_file(&ctx1).unwrap();
         assert_eq!(
diff --git a/src/receive_imf/receive_imf_tests.rs b/src/receive_imf/receive_imf_tests.rs
index f36295717..f1aa32aba 100644
--- a/src/receive_imf/receive_imf_tests.rs
+++ b/src/receive_imf/receive_imf_tests.rs
@@ -704,10 +704,10 @@ async fn test_parse_ndn_group_msg() -> Result<()> {
     assert_eq!(msg.state, MessageState::OutFailed);
 
     let msgs = chat::get_chat_msgs(&t, msg.chat_id).await?;
-    let ChatItem::Message { msg_id } = *msgs.last().unwrap() else {
-        panic!("Wrong item type");
-    };
-    assert_eq!(msg_id, msg.id);
+    assert!(matches!(
+        *msgs.last().unwrap(),
+        ChatItem::Message { msg_id } if msg_id == msg.id
+    ));
     Ok(())
 }
 
@@ -1598,9 +1598,7 @@ async fn test_in_reply_to() {
 
     // Load the first message from the same chat.
     let msgs = chat::get_chat_msgs(&t, msg.chat_id).await.unwrap();
-    let msg_id = if let ChatItem::Message { msg_id } = msgs.first().unwrap() {
-        msg_id
-    } else {
+    let ChatItem::Message { msg_id } = msgs.first().unwrap() else {
         panic!("Wrong item type");
     };
 
diff --git a/src/test_utils.rs b/src/test_utils.rs
index 94bdce166..a9711d4e3 100644
--- a/src/test_utils.rs
+++ b/src/test_utils.rs
@@ -1557,9 +1557,7 @@ pub(crate) async fn get_chat_msg(
         asserted_msgs_count,
         msgs.len()
     );
-    let msg_id = if let ChatItem::Message { msg_id } = msgs[index] {
-        msg_id
-    } else {
+    let ChatItem::Message { msg_id } = msgs[index] else {
         panic!("Wrong item type");
     };
     Message::load_from_db(&t.ctx, msg_id).await.unwrap()