mirror of
https://github.com/chatmail/core.git
synced 2026-05-22 16:26:31 +03:00
properly fix the QueryReturnedNoRows warning and rustfmt
This commit is contained in:
@@ -152,6 +152,16 @@ pub fn dc_chat_load_from_db(chat: *mut Chat, chat_id: u32) -> bool {
|
|||||||
);
|
);
|
||||||
|
|
||||||
match res {
|
match res {
|
||||||
|
Err(crate::error::Error::Sql(rusqlite::Error::QueryReturnedNoRows)) => false,
|
||||||
|
Err(err) => match err {
|
||||||
|
_ => {
|
||||||
|
error!(
|
||||||
|
context,
|
||||||
|
0, "chat: failed to load from db {}: {:?}", chat_id, err
|
||||||
|
);
|
||||||
|
false
|
||||||
|
}
|
||||||
|
},
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
let c = unsafe { &mut *chat };
|
let c = unsafe { &mut *chat };
|
||||||
match c.id {
|
match c.id {
|
||||||
@@ -184,16 +194,6 @@ pub fn dc_chat_load_from_db(chat: *mut Chat, chat_id: u32) -> bool {
|
|||||||
}
|
}
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
Err(err) => match err {
|
|
||||||
QueryReturnedNoRows => false,
|
|
||||||
_ => {
|
|
||||||
error!(
|
|
||||||
context,
|
|
||||||
0, "chat: failed to load from db {}: {:?}", chat_id, err
|
|
||||||
);
|
|
||||||
false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -515,9 +515,7 @@ pub unsafe fn dc_receive_imf(
|
|||||||
(*part).bytes,
|
(*part).bytes,
|
||||||
hidden,
|
hidden,
|
||||||
if 0 != save_mime_headers {
|
if 0 != save_mime_headers {
|
||||||
let body_string = unsafe {
|
let body_string = std::str::from_utf8(std::slice::from_raw_parts(imf_raw_not_terminated as *const u8, imf_raw_bytes)).unwrap();
|
||||||
std::str::from_utf8(std::slice::from_raw_parts(imf_raw_not_terminated as *const u8, imf_raw_bytes)).unwrap()
|
|
||||||
};
|
|
||||||
|
|
||||||
Some(body_string)
|
Some(body_string)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user