From 0253572975e69e2ec9801fb205e946972269c417 Mon Sep 17 00:00:00 2001
From: veeso <christian.visintin1997@gmail.com>
Date: Sat, 8 May 2021 18:21:24 +0200
Subject: [PATCH] Clippy rust 1.52

---
 src/filetransfer/ftp_transfer.rs                   |  9 ++++-----
 src/ui/activities/filetransfer_activity/actions.rs | 10 ++--------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/filetransfer/ftp_transfer.rs b/src/filetransfer/ftp_transfer.rs
index 2f8e4a6..1d7d6e7 100644
--- a/src/filetransfer/ftp_transfer.rs
+++ b/src/filetransfer/ftp_transfer.rs
@@ -185,9 +185,8 @@ impl FtpFileTransfer {
                     return Err(());
                 }
                 // Get symlink
-                let symlink: Option<Box<FsEntry>> = match symlink_path {
-                    None => None,
-                    Some(p) => Some(Box::new(match p.to_string_lossy().ends_with('/') {
+                let symlink: Option<Box<FsEntry>> = symlink_path.map(|p| {
+                    Box::new(match p.to_string_lossy().ends_with('/') {
                         true => {
                             // NOTE: is_dir becomes true
                             is_dir = true;
@@ -226,8 +225,8 @@ impl FtpFileTransfer {
                             group: gid,
                             unix_pex: Some(unix_pex),
                         }),
-                    })),
-                };
+                    })
+                });
                 let mut abs_path: PathBuf = PathBuf::from(path);
                 abs_path.push(file_name.as_str());
                 let abs_path: PathBuf = Self::resolve(abs_path.as_path());
diff --git a/src/ui/activities/filetransfer_activity/actions.rs b/src/ui/activities/filetransfer_activity/actions.rs
index 64ad5e0..26beb7c 100644
--- a/src/ui/activities/filetransfer_activity/actions.rs
+++ b/src/ui/activities/filetransfer_activity/actions.rs
@@ -327,10 +327,7 @@ impl FileTransferActivity {
 
     pub(super) fn action_remote_rename(&mut self, input: String) {
         if let Some(idx) = self.get_remote_file_idx() {
-            let entry = match self.remote().get(idx) {
-                None => None,
-                Some(e) => Some(e.clone()),
-            };
+            let entry = self.remote().get(idx).cloned();
             if let Some(entry) = entry {
                 let dst_path: PathBuf = PathBuf::from(input);
                 let full_path: PathBuf = entry.get_abs_path();
@@ -390,10 +387,7 @@ impl FileTransferActivity {
     pub(super) fn action_remote_delete(&mut self) {
         if let Some(idx) = self.get_remote_file_idx() {
             // Check if file entry exists
-            let entry = match self.remote().get(idx) {
-                None => None,
-                Some(e) => Some(e.clone()),
-            };
+            let entry = self.remote().get(idx).cloned();
             if let Some(entry) = entry {
                 let full_path: PathBuf = entry.get_abs_path();
                 // Delete file