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

deltachat-ffi: use as_deref() as suggested by clippy

Browse Source
This commit is contained in:
Alexander Krotov
2020-06-22 02:05:07 +03:00
committed by link2xt
parent 22c62ea6af
commit cf09942737
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
deltachat-ffi/src/lib.rs
View File

@@ -126,7 +126,7 @@ pub unsafe extern "C" fn dc_set_config(
// When ctx.set_config() fails it already logged the error. // When ctx.set_config() fails it already logged the error.
// TODO: Context::set_config() should not log this // TODO: Context::set_config() should not log this
Ok(key) => block_on(async move { Ok(key) => block_on(async move {
ctx.set_config(key, to_opt_string_lossy(value).as_ref().map(|x| x.as_str())) ctx.set_config(key, to_opt_string_lossy(value).as_deref())
.await .await
.is_ok() as libc::c_int .is_ok() as libc::c_int
}), }),
@@ -554,14 +554,7 @@ pub unsafe extern "C" fn dc_get_chatlist(
let qi = if query_id == 0 { None } else { Some(query_id) }; let qi = if query_id == 0 { None } else { Some(query_id) };
block_on(async move { block_on(async move {
match chatlist::Chatlist::try_load( match chatlist::Chatlist::try_load(&ctx, flags as usize, qs.as_deref(), qi).await {
&ctx,
flags as usize,
qs.as_ref().map(|x| x.as_str()),
qi,
)
.await
{
Ok(list) => { Ok(list) => {
let ffi_list = ChatlistWrapper { context, list }; let ffi_list = ChatlistWrapper { context, list };
Box::into_raw(Box::new(ffi_list)) Box::into_raw(Box::new(ffi_list))
@@ -752,13 +745,9 @@ pub unsafe extern "C" fn dc_add_device_msg(
}; };
block_on(async move { block_on(async move {
chat::add_device_msg( chat::add_device_msg(&ctx, to_opt_string_lossy(label).as_deref(), msg)
&ctx, .await
to_opt_string_lossy(label).as_ref().map(|x| x.as_str()), .unwrap_or_log_default(&ctx, "Failed to add device message")
msg,
)
.await
.unwrap_or_log_default(&ctx, "Failed to add device message")
}) })
.to_u32() .to_u32()
} }
@@ -2816,7 +2805,7 @@ pub unsafe extern "C" fn dc_msg_set_file(
let ffi_msg = &mut *msg; let ffi_msg = &mut *msg;
ffi_msg.message.set_file( ffi_msg.message.set_file(
to_string_lossy(file), to_string_lossy(file),
to_opt_string_lossy(filemime).as_ref().map(|x| x.as_str()), to_opt_string_lossy(filemime).as_deref(),
) )
} }