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

Fix clippy warnings in deltachat-ffi

Browse Source
This commit is contained in:
Alexander Krotov
2019-12-25 18:08:40 +01:00
parent f73ba895af
commit ffa6378108
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,9 @@
non_snake_case, non_snake_case,
non_upper_case_globals, non_upper_case_globals,
non_upper_case_globals, non_upper_case_globals,
non_camel_case_types non_camel_case_types,
clippy::missing_safety_doc,
clippy::expect_fun_call
)] )]
#[macro_use] #[macro_use]
@@ -413,7 +415,7 @@ fn render_info(
) -> std::result::Result<String, std::fmt::Error> { ) -> std::result::Result<String, std::fmt::Error> {
let mut res = String::new(); let mut res = String::new();
for (key, value) in &info { for (key, value) in &info {
write!(&mut res, "{}={}\n", key, value)?; writeln!(&mut res, "{}={}", key, value)?;
} }
Ok(res) Ok(res)
@@ -1344,7 +1346,7 @@ pub unsafe extern "C" fn dc_get_mime_headers(
.with_inner(|ctx| { .with_inner(|ctx| {
message::get_mime_headers(ctx, MsgId::new(msg_id)) message::get_mime_headers(ctx, MsgId::new(msg_id))
.map(|s| s.strdup()) .map(|s| s.strdup())
.unwrap_or_else(|| ptr::null_mut()) .unwrap_or_else(ptr::null_mut)
}) })
.unwrap_or_else(|_| ptr::null_mut()) .unwrap_or_else(|_| ptr::null_mut())
} }
@@ -1811,7 +1813,7 @@ pub unsafe extern "C" fn dc_get_securejoin_qr(
ffi_context ffi_context
.with_inner(|ctx| { .with_inner(|ctx| {
securejoin::dc_get_securejoin_qr(ctx, chat_id) securejoin::dc_get_securejoin_qr(ctx, chat_id)
.unwrap_or("".to_string()) .unwrap_or_else(|| "".to_string())
.strdup() .strdup()
}) })
.unwrap_or_else(|_| "".strdup()) .unwrap_or_else(|_| "".strdup())
@@ -2599,7 +2601,7 @@ pub unsafe extern "C" fn dc_msg_get_filemime(msg: *mut dc_msg_t) -> *mut libc::c
if let Some(x) = ffi_msg.message.get_filemime() { if let Some(x) = ffi_msg.message.get_filemime() {
x.strdup() x.strdup()
} else { } else {
return dc_strdup(ptr::null()); dc_strdup(ptr::null())
} }
} }
@@ -2991,7 +2993,7 @@ pub unsafe extern "C" fn dc_contact_get_profile_image(
.contact .contact
.get_profile_image(ctx) .get_profile_image(ctx)
.map(|p| p.to_string_lossy().strdup()) .map(|p| p.to_string_lossy().strdup())
.unwrap_or_else(|| std::ptr::null_mut()) .unwrap_or_else(std::ptr::null_mut)
}) })
.unwrap_or_else(|_| ptr::null_mut()) .unwrap_or_else(|_| ptr::null_mut())
} }

4
deltachat-ffi/src/providers.rs
View File

@@ -86,8 +86,6 @@ pub unsafe extern "C" fn dc_provider_get_status(provider: *const dc_provider_t)
} }
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn dc_provider_unref(_provider: *const dc_provider_t) { pub unsafe extern "C" fn dc_provider_unref(_provider: *const dc_provider_t) {}
()
}
// TODO expose general provider overview url? // TODO expose general provider overview url?