diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs index f0811118f..a89764c0d 100644 --- a/deltachat-ffi/src/lib.rs +++ b/deltachat-ffi/src/lib.rs @@ -2225,7 +2225,7 @@ pub unsafe extern "C" fn dc_send_backup( .await .map(|transfer| Box::into_raw(Box::new(dc_backup_sender { transfer }))) .log_err(ctx, "send_backup failed") - .unwrap_or_else(|_| ptr::null_mut()) + .unwrap_or(ptr::null_mut()) }) } else { eprintln!("dc_imex called without a valid directory"); @@ -2250,10 +2250,10 @@ pub unsafe extern "C" fn dc_backup_sender_qr( let bs = &*bs; let ticket = bs.transfer.ticket(); - qr_code_generator::generate_backup_qr_code(&ticket) + qr_code_generator::generate_backup_qr_code(ticket) .map(|s| s.strdup()) .log_err(ctx, "generate_backup_qr_code failed") - .unwrap_or_else(|_| ptr::null_mut()) + .unwrap_or(ptr::null_mut()) } #[no_mangle] diff --git a/examples/repl/cmdline.rs b/examples/repl/cmdline.rs index fdd5314ab..acb25b91a 100644 --- a/examples/repl/cmdline.rs +++ b/examples/repl/cmdline.rs @@ -483,7 +483,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu let tdir = tempfile::TempDir::new()?; let dir = tdir.path(); println!("Storing backup in: {} ", dir.display()); - let transfer = send_backup(&context, dir.as_ref(), Some(arg1.to_string())).await?; + let transfer = send_backup(&context, dir, Some(arg1.to_string())).await?; let ticket = transfer.ticket(); let ticket_bytes = ticket.as_bytes(); diff --git a/src/imex.rs b/src/imex.rs index 835bc030a..6e4c7dedc 100644 --- a/src/imex.rs +++ b/src/imex.rs @@ -864,7 +864,7 @@ async fn export_backup_iroh_inner( dir_builder.name( temp_path .file_name() - .map(|s| s.to_string_lossy().to_owned()) + .map(|s| s.to_string_lossy()) .unwrap_or_default(), );