Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-10 18:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use some more let..else

Browse Source
This commit is contained in:
link2xt
2026-05-10 16:09:04 +02:00
parent 6fb2f27831
commit 00357b3883
3 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/imex/transfer.rs
View File

@@ -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!(

12
src/receive_imf/receive_imf_tests.rs
View File

@@ -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");
};

4
src/test_utils.rs
View File

@@ -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()