Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-09 01:46:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix one clippy::unneeded_unwrap warning

Browse Source
This commit is contained in:
Dmitry Bogatov
2019-08-27 23:06:56 +00:00
parent 0a9f61783d
commit 85e16f6e82
1 changed files with 49 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/chat.rs
View File

@@ -1563,10 +1563,8 @@ pub unsafe fn remove_contact_from_chat(
/* we do not check if "contact_id" exists but just delete all records with the id from chats_contacts */
/* this allows to delete pending references to deleted contacts. Of course, this should _not_ happen. */
let chat = Chat::load_from_db(context, chat_id);
if !(!real_group_exists(context, chat_id) || chat.is_err()) {
let chat = chat.unwrap();
if let Ok(chat) = Chat::load_from_db(context, chat_id) {
if real_group_exists(context, chat_id) {
if !(is_contact_in_chat(context, chat_id, 1 as u32) == 1) {
log_event!(
context,
@@ -1618,6 +1616,7 @@ pub unsafe fn remove_contact_from_chat(
}
}
}
}
if !success {
bail!("Failed to remove contact");