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

Move created_db_entries into cleanup closure instead of borrowing

Browse Source
This commit is contained in:
Alexander Krotov
2020-02-10 23:31:46 +03:00
parent 8461cf6443
commit 1071ab05db
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/dc_receive_imf.rs
View File

@@ -74,18 +74,12 @@ pub fn dc_receive_imf(
// helper method to handle early exit and memory cleanup // helper method to handle early exit and memory cleanup
let cleanup = |context: &Context, let cleanup = |context: &Context,
create_event_to_send: &Option<CreateEvent>, create_event_to_send: &Option<CreateEvent>,
created_db_entries: &Vec<(ChatId, MsgId)>| { created_db_entries: Vec<(ChatId, MsgId)>| {
if let Some(create_event_to_send) = create_event_to_send { if let Some(create_event_to_send) = create_event_to_send {
for (chat_id, msg_id) in created_db_entries { for (chat_id, msg_id) in created_db_entries {
let event = match create_event_to_send { let event = match create_event_to_send {
CreateEvent::MsgsChanged => Event::MsgsChanged { CreateEvent::MsgsChanged => Event::MsgsChanged { msg_id, chat_id },
msg_id: *msg_id, CreateEvent::IncomingMsg => Event::IncomingMsg { msg_id, chat_id },
chat_id: *chat_id,
},
CreateEvent::IncomingMsg => Event::IncomingMsg {
msg_id: *msg_id,
chat_id: *chat_id,
},
}; };
context.call_cb(event); context.call_cb(event);
} }
@@ -165,7 +159,7 @@ pub fn dc_receive_imf(
&mut created_db_entries, &mut created_db_entries,
&mut create_event_to_send, &mut create_event_to_send,
) { ) {
cleanup(context, &create_event_to_send, &created_db_entries); cleanup(context, &create_event_to_send, created_db_entries);
bail!("add_parts error: {:?}", err); bail!("add_parts error: {:?}", err);
} }
} else { } else {
@@ -216,7 +210,7 @@ pub fn dc_receive_imf(
"received message {} has Message-Id: {}", server_uid, rfc724_mid "received message {} has Message-Id: {}", server_uid, rfc724_mid
); );
cleanup(context, &create_event_to_send, &created_db_entries); cleanup(context, &create_event_to_send, created_db_entries);
mime_parser.handle_reports(context, from_id, sent_timestamp, &server_folder, server_uid); mime_parser.handle_reports(context, from_id, sent_timestamp, &server_folder, server_uid);