From ac8cde811d379573e8007160066755c0411fc8f5 Mon Sep 17 00:00:00 2001 From: ChristianVisintin Date: Fri, 27 Nov 2020 16:37:00 +0100 Subject: [PATCH] FsEntry as reference in remove method --- src/filetransfer/mod.rs | 6 +++--- src/filetransfer/sftp_transfer.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/filetransfer/mod.rs b/src/filetransfer/mod.rs index d4f12e5..afb5c85 100644 --- a/src/filetransfer/mod.rs +++ b/src/filetransfer/mod.rs @@ -59,7 +59,7 @@ pub enum FileTransferError { NoSuchFileOrDirectory, ProtocolError, UninitializedSession, - UnknownError, + //UnknownError, } impl FileTransferError { @@ -79,7 +79,7 @@ impl FileTransferError { FileTransferError::NoSuchFileOrDirectory => String::from("No such file or directory"), FileTransferError::ProtocolError => String::from("Protocol error"), FileTransferError::UninitializedSession => String::from("Uninitialized session"), - FileTransferError::UnknownError => String::from("Unknown error"), + //FileTransferError::UnknownError => String::from("Unknown error"), } } @@ -134,7 +134,7 @@ pub trait FileTransfer { /// ### remove /// /// Remove a file or a directory - fn remove(&self, file: FsEntry) -> Result<(), FileTransferError>; + fn remove(&self, file: &FsEntry) -> Result<(), FileTransferError>; /// ### send_file /// diff --git a/src/filetransfer/sftp_transfer.rs b/src/filetransfer/sftp_transfer.rs index 1987cec..cf79ace 100644 --- a/src/filetransfer/sftp_transfer.rs +++ b/src/filetransfer/sftp_transfer.rs @@ -330,7 +330,7 @@ impl FileTransfer for SftpFileTransfer { /// ### remove /// /// Remove a file or a directory - fn remove(&self, file: FsEntry) -> Result<(), FileTransferError> { + fn remove(&self, file: &FsEntry) -> Result<(), FileTransferError> { match self.sftp.as_ref() { None => Err(FileTransferError::UninitializedSession), Some(sftp) => { @@ -350,7 +350,7 @@ impl FileTransfer for SftpFileTransfer { Ok(entries) => { // Remove each entry for entry in entries { - if let Err(err) = self.remove(entry) { + if let Err(err) = self.remove(&entry) { return Err(err); } }