Fix clippy warnings

uutils · May 5, 2024 · 4482bdb · 4482bdb
1 parent b8001cc
commit 4482bdb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/context_diff.rs b/src/context_diff.rs
@@ -269,12 +269,12 @@ fn make_diff(
 #[must_use]
 pub fn diff(expected: &[u8], actual: &[u8], params: &Params) -> Vec<u8> {
     let from_modified_time =
-        match !params.stdin_path.is_empty() && params.from.to_string_lossy().starts_with("-") {
+        match !params.stdin_path.is_empty() && params.from.to_string_lossy().starts_with('-') {
             true => get_modification_time(&params.stdin_path.to_string_lossy()),
             false => get_modification_time(&params.from.to_string_lossy()),
         };
     let to_modified_time =
-        match !params.stdin_path.is_empty() && params.to.to_string_lossy().starts_with("-") {
+        match !params.stdin_path.is_empty() && params.to.to_string_lossy().starts_with('-') {
             true => get_modification_time(&params.stdin_path.to_string_lossy()),
             false => get_modification_time(&params.to.to_string_lossy()),
         };

diff --git a/src/main.rs b/src/main.rs
@@ -47,7 +47,7 @@ fn main() -> ExitCode {
     }
     // read files
     fn read_file_contents(filepath: &OsString, stdin_path: &OsString) -> io::Result<Vec<u8>> {
-        if filepath.to_string_lossy().starts_with("-") && !stdin_path.is_empty() {
+        if filepath.to_string_lossy().starts_with('-') && !stdin_path.is_empty() {
             fs::read(stdin_path)
         } else if filepath == "-" {
             let mut content = Vec::new();

diff --git a/src/params.rs b/src/params.rs
@@ -190,12 +190,11 @@ pub fn parse_params<I: IntoIterator<Item = OsString>>(opts: I) -> Result<Params,
     let file = File::from(fd);
     let meta = file.metadata().unwrap();
     if meta.is_dir() {
-        let stdin = fs::canonicalize("/dev/stdin").unwrap();
-        let mut stdin_path: PathBuf = PathBuf::from(stdin);
+        let mut stdin_path = fs::canonicalize("/dev/stdin").unwrap();
         if params.from == "-" {
-            stdin_path.push(&to_path.file_name().unwrap());
+            stdin_path.push(to_path.file_name().unwrap());
         } else {
-            stdin_path.push(&from_path.file_name().unwrap());
+            stdin_path.push(from_path.file_name().unwrap());
         }
         params.stdin_path = stdin_path.into();
     }

diff --git a/src/unified_diff.rs b/src/unified_diff.rs
@@ -240,12 +240,12 @@ fn make_diff(
 #[must_use]
 pub fn diff(expected: &[u8], actual: &[u8], params: &Params) -> Vec<u8> {
     let from_modified_time =
-        match !params.stdin_path.is_empty() && params.from.to_string_lossy().starts_with("-") {
+        match !params.stdin_path.is_empty() && params.from.to_string_lossy().starts_with('-') {
             true => get_modification_time(&params.stdin_path.to_string_lossy()),
             false => get_modification_time(&params.from.to_string_lossy()),
         };
     let to_modified_time =
-        match !params.stdin_path.is_empty() && params.to.to_string_lossy().starts_with("-") {
+        match !params.stdin_path.is_empty() && params.to.to_string_lossy().starts_with('-') {
             true => get_modification_time(&params.stdin_path.to_string_lossy()),
             false => get_modification_time(&params.to.to_string_lossy()),
         };