diff --git a/crates/bsk-cli/src/cli/download.rs b/crates/bsk-cli/src/cli/download.rs index 863206d..043b4d1 100644 --- a/crates/bsk-cli/src/cli/download.rs +++ b/crates/bsk-cli/src/cli/download.rs @@ -91,7 +91,7 @@ pub fn dispatch(args: DownloadArgs, format: Format) -> Result<(), CliError> { Ok(()) } -fn write_transfer(sock: &PathBuf, id: &str, out: &Path, overwrite: bool) -> Result<(), CliError> { +fn write_transfer(sock: &Path, id: &str, out: &Path, overwrite: bool) -> Result<(), CliError> { let parent = out .parent() .filter(|p| !p.as_os_str().is_empty()) @@ -107,7 +107,7 @@ fn write_transfer(sock: &PathBuf, id: &str, out: &Path, overwrite: bool) -> Resu let mut offset = 0u64; loop { let chunk: TransferChunkResult = crate::cli::business_rpc::call( - sock.clone(), + sock.to_path_buf(), "transfer-read", Method::TransferRead, Some(TransferChunkParams { diff --git a/crates/bsk-cli/src/cli/upload.rs b/crates/bsk-cli/src/cli/upload.rs index ac408e2..9614e0b 100644 --- a/crates/bsk-cli/src/cli/upload.rs +++ b/crates/bsk-cli/src/cli/upload.rs @@ -2,7 +2,7 @@ use std::fs::File; use std::io::Read; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::time::Duration; use anyhow::Context; @@ -93,7 +93,7 @@ pub fn dispatch(args: UploadArgs, format: Format) -> Result<(), CliError> { Ok(()) } -fn stage_file(sock: &PathBuf, session: &str, path: &PathBuf) -> Result<(String, String), CliError> { +fn stage_file(sock: &Path, session: &str, path: &PathBuf) -> Result<(String, String), CliError> { let mut file = File::open(path) .with_context(|| format!("open upload file {}", path.display())) .map_err(CliError::Local)?; @@ -114,7 +114,7 @@ fn stage_file(sock: &PathBuf, session: &str, path: &PathBuf) -> Result<(String, .ok_or_else(|| CliError::Local(anyhow::anyhow!("upload file has no valid basename")))? .to_string(); let begin: TransferBeginResult = crate::cli::business_rpc::call( - sock.clone(), + sock.to_path_buf(), "transfer-begin", Method::TransferBegin, Some(TransferBeginParams { @@ -133,7 +133,7 @@ fn stage_file(sock: &PathBuf, session: &str, path: &PathBuf) -> Result<(String, break; } let reply: TransferChunkResult = crate::cli::business_rpc::call( - sock.clone(), + sock.to_path_buf(), "transfer-chunk", Method::TransferChunk, Some(TransferChunkParams { @@ -146,7 +146,7 @@ fn stage_file(sock: &PathBuf, session: &str, path: &PathBuf) -> Result<(String, offset = reply.next_offset; } let _: TransferReadyResult = crate::cli::business_rpc::call( - sock.clone(), + sock.to_path_buf(), "transfer-finish", Method::TransferFinish, Some(TransferIdParams { @@ -163,9 +163,9 @@ fn stage_file(sock: &PathBuf, session: &str, path: &PathBuf) -> Result<(String, Ok((begin.transfer_id, name)) } -fn release(sock: &PathBuf, id: &str) -> Result { +fn release(sock: &Path, id: &str) -> Result { crate::cli::business_rpc::call( - sock.clone(), + sock.to_path_buf(), "transfer-release", Method::TransferRelease, Some(TransferIdParams { diff --git a/crates/bsk-cli/src/daemon/file_transfer.rs b/crates/bsk-cli/src/daemon/file_transfer.rs index 354eec1..b63ca50 100644 --- a/crates/bsk-cli/src/daemon/file_transfer.rs +++ b/crates/bsk-cli/src/daemon/file_transfer.rs @@ -461,7 +461,7 @@ mod tests { .unwrap(); assert!( registry - .resolve_uploads("s1", &[begin.transfer_id.clone()]) + .resolve_uploads("s1", std::slice::from_ref(&begin.transfer_id)) .is_err() ); registry @@ -478,7 +478,7 @@ mod tests { .unwrap(); assert!( registry - .resolve_uploads("s2", &[begin.transfer_id.clone()]) + .resolve_uploads("s2", std::slice::from_ref(&begin.transfer_id)) .is_err() ); let [path] = registry