refactor(imap): use format! for warnings in deletion

This commit is contained in:
dignifiedquire
2019-05-19 17:54:35 +02:00
parent 379fc72094
commit 45385abc4f

View File

@@ -1500,18 +1500,22 @@ impl Imap {
info!( info!(
context, context,
0, 0,
"Marking message \"%s\", %s/%i for deletion...", format!(
&message_id, "Marking message \"{}\", {}/{} for deletion...",
CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(), message_id.as_ref(),
*server_uid as libc::c_int folder.as_ref(),
server_uid,
)
); );
if self.select_folder(context, Some(&folder)) == 0 { if self.select_folder(context, Some(&folder)) == 0 {
warn!( warn!(
context, context,
0, 0,
"Cannot select folder %s for deleting message.", format!(
CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(), "Cannot select folder {} for deleting message.",
folder.as_ref()
)
); );
} else { } else {
let set = format!("{}", server_uid); let set = format!("{}", server_uid);
@@ -1531,10 +1535,12 @@ impl Imap {
warn!( warn!(
context, context,
0, 0,
"Cannot delete on IMAP, %s/%i does not match %s.", format!(
CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(), "Cannot delete on IMAP, {}/{} does not match {}.",
*server_uid as libc::c_int, folder.as_ref(),
message_id, server_uid,
message_id.as_ref(),
)
); );
*server_uid = 0; *server_uid = 0;
} }
@@ -1545,9 +1551,11 @@ impl Imap {
warn!( warn!(
context, context,
0, 0,
"Cannot delete on IMAP, %s/%i not found.", format!(
CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(), "Cannot delete on IMAP, {}/{} not found.",
*server_uid as libc::c_int, folder.as_ref(),
server_uid,
)
); );
*server_uid = 0; *server_uid = 0;
} }