From beda329a21ea2808edf317485dce2ec991f27cf0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 7 Feb 2021 15:12:15 +0100 Subject: [PATCH] Fix some clippy warnings --- src/uu/install/src/install.rs | 8 ++++---- src/uu/ln/src/ln.rs | 5 ++--- src/uu/split/src/platform/unix.rs | 4 +--- src/uu/tail/src/tail.rs | 4 ++-- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/uu/install/src/install.rs b/src/uu/install/src/install.rs index b0c6f1930..3f3502cb6 100644 --- a/src/uu/install/src/install.rs +++ b/src/uu/install/src/install.rs @@ -495,7 +495,7 @@ fn copy(from: &PathBuf, to: &PathBuf, b: &Behavior) -> Result<(), ()> { return Err(()); } - if b.owner != "" { + if !b.owner.is_empty() { let meta = match fs::metadata(to) { Ok(meta) => meta, Err(f) => crash!(1, "{}", f.to_string()), @@ -515,7 +515,7 @@ fn copy(from: &PathBuf, to: &PathBuf, b: &Behavior) -> Result<(), ()> { Verbosity::Normal, ) { Ok(n) => { - if n != "" { + if !n.is_empty() { show_info!("{}", n); } } @@ -523,7 +523,7 @@ fn copy(from: &PathBuf, to: &PathBuf, b: &Behavior) -> Result<(), ()> { } } - if b.group != "" { + if !b.group.is_empty() { let meta = match fs::metadata(to) { Ok(meta) => meta, Err(f) => crash!(1, "{}", f.to_string()), @@ -535,7 +535,7 @@ fn copy(from: &PathBuf, to: &PathBuf, b: &Behavior) -> Result<(), ()> { }; match wrap_chgrp(to.as_path(), &meta, group_id, false, Verbosity::Normal) { Ok(n) => { - if n != "" { + if !n.is_empty() { show_info!("{}", n); } } diff --git a/src/uu/ln/src/ln.rs b/src/uu/ln/src/ln.rs index d257feb70..e06468367 100644 --- a/src/uu/ln/src/ln.rs +++ b/src/uu/ln/src/ln.rs @@ -325,9 +325,8 @@ fn link_files_in_dir(files: &[PathBuf], target_dir: &PathBuf, settings: &Setting // Not sure why but on Windows, the symlink can be // considered as a dir // See test_ln::test_symlink_no_deref_dir - match fs::remove_dir(target_dir) { - Err(e) => show_error!("Could not update {}: {}", target_dir.display(), e), - _ => (), + if let Err(e) = fs::remove_dir(target_dir) { + show_error!("Could not update {}: {}", target_dir.display(), e) }; } } diff --git a/src/uu/split/src/platform/unix.rs b/src/uu/split/src/platform/unix.rs index 45333ceb2..331b31115 100644 --- a/src/uu/split/src/platform/unix.rs +++ b/src/uu/split/src/platform/unix.rs @@ -75,9 +75,7 @@ impl FilterWriter { .spawn() .expect("Couldn't spawn filter command"); - FilterWriter { - shell_process: shell_process, - } + FilterWriter { shell_process } } } diff --git a/src/uu/tail/src/tail.rs b/src/uu/tail/src/tail.rs index 6d80172cc..2276885e0 100644 --- a/src/uu/tail/src/tail.rs +++ b/src/uu/tail/src/tail.rs @@ -163,7 +163,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { match matches.value_of(OPT_LINES) { Some(n) => { - let mut slice: &str = n.as_ref(); + let mut slice: &str = n; if slice.chars().next().unwrap_or('_') == '+' { settings.beginning = true; slice = &slice[1..]; @@ -178,7 +178,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } None => { if let Some(n) = matches.value_of(OPT_BYTES) { - let mut slice: &str = n.as_ref(); + let mut slice: &str = n; if slice.chars().next().unwrap_or('_') == '+' { settings.beginning = true; slice = &slice[1..];