clippy fixes

This commit is contained in:
dignifiedquire
2022-09-19 21:49:44 +02:00
parent 1f4384b302
commit c9cd4c9746
3 changed files with 5 additions and 5 deletions

View File

@@ -2225,7 +2225,7 @@ pub unsafe extern "C" fn dc_send_backup(
.await .await
.map(|transfer| Box::into_raw(Box::new(dc_backup_sender { transfer }))) .map(|transfer| Box::into_raw(Box::new(dc_backup_sender { transfer })))
.log_err(ctx, "send_backup failed") .log_err(ctx, "send_backup failed")
.unwrap_or_else(|_| ptr::null_mut()) .unwrap_or(ptr::null_mut())
}) })
} else { } else {
eprintln!("dc_imex called without a valid directory"); 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 bs = &*bs;
let ticket = bs.transfer.ticket(); 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()) .map(|s| s.strdup())
.log_err(ctx, "generate_backup_qr_code failed") .log_err(ctx, "generate_backup_qr_code failed")
.unwrap_or_else(|_| ptr::null_mut()) .unwrap_or(ptr::null_mut())
} }
#[no_mangle] #[no_mangle]

View File

@@ -483,7 +483,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
let tdir = tempfile::TempDir::new()?; let tdir = tempfile::TempDir::new()?;
let dir = tdir.path(); let dir = tdir.path();
println!("Storing backup in: {} ", dir.display()); 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 = transfer.ticket();
let ticket_bytes = ticket.as_bytes(); let ticket_bytes = ticket.as_bytes();

View File

@@ -864,7 +864,7 @@ async fn export_backup_iroh_inner(
dir_builder.name( dir_builder.name(
temp_path temp_path
.file_name() .file_name()
.map(|s| s.to_string_lossy().to_owned()) .map(|s| s.to_string_lossy())
.unwrap_or_default(), .unwrap_or_default(),
); );