maxmustermann/termscp
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Clippy rust 1.52

Browse source
This commit is contained in:
veeso 2021-05-08 18:21:24 +02:00
parent 0328c1de81
commit 0253572975
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/filetransfer/ftp_transfer.rs
View file

@ -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());

10
src/ui/activities/filetransfer_activity/actions.rs
View file

@ -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