clippy

Author: folkertdev

rc-zip-cli/src/main.rs

@@ -22,7 +22,7 @@ where
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         if let Some(x) = self.0.as_ref() {
-            write!(f, "{}", x)
+            write!(f, "{x}")
         } else {
             write!(f, "∅")
         }
@@ -35,7 +35,7 @@ where
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         if let Some(x) = self.0.as_ref() {
-            write!(f, "{:?}", x)
+            write!(f, "{x:?}")
         } else {
             write!(f, "∅")
         }
@@ -111,7 +111,7 @@ fn do_main(cli: Cli) -> Result<(), Box<dyn std::error::Error>> {
                 }
             }
         }
-        println!("Versions: {:?}", reader_versions);
+        println!("Versions: {reader_versions:?}");
         println!("Encoding: {}, Methods: {:?}", archive.encoding(), methods);
         println!(
             "{} ({:.2}% compression) ({} files, {} dirs, {} symlinks)",
@@ -160,7 +160,7 @@ fn do_main(cli: Cli) -> Result<(), Box<dyn std::error::Error>> {
                     if let EntryKind::Symlink = entry.kind() {
                         let mut target = String::new();
                         entry.reader().read_to_string(&mut target).unwrap();
-                        print!("\t{target}", target = target);
+                        print!("\t{target}");
                     }
 
                     print!("\t{:?}", entry.method);

rc-zip-sync/src/entry_reader.rs

@@ -59,10 +59,7 @@ where
                         // progress was made, keep reading
                         continue;
                     } else {
-                        return Err(io::Error::new(
-                            io::ErrorKind::Other,
-                            "entry reader: no progress",
-                        ));
+                        return Err(io::Error::other("entry reader: no progress"));
                     }
                 }
                 FsmResult::Done(_) => {

rc-zip-sync/src/local_header_reader.rs

@@ -75,10 +75,7 @@ where
                         // progress was made, keep reading
                         continue;
                     } else {
-                        return Err(io::Error::new(
-                            io::ErrorKind::Other,
-                            "entry reader: no progress",
-                        ));
+                        return Err(io::Error::other("entry reader: no progress"));
                     }
                 }
                 FsmResult::Done((_, local_file_header, aex_data)) => {

rc-zip-tokio/src/entry_reader.rs

@@ -81,11 +81,7 @@ where
                         // progress was made, keep reading
                         continue;
                     } else {
-                        return Err(io::Error::new(
-                            io::ErrorKind::Other,
-                            "entry reader: no progress",
-                        ))
-                        .into();
+                        return Err(io::Error::other("entry reader: no progress")).into();
                     }
                 }
                 FsmResult::Done(_) => {

rc-zip-tokio/src/read_zip.rs

@@ -350,7 +350,7 @@ impl AsyncRead for AsyncRandomAccessFileCursor {
                 let core = futures_util::ready!(fut
                     .as_mut()
                     .poll(cx)
-                    .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))??);
+                    .map_err(|e| io::Error::other(e.to_string()))??);
                 let is_eof = core.inner_buf_len == 0;
                 self.state = ARAFCState::Idle(core);
 

rc-zip-tokio/tests/integration_tests.rs

@@ -122,7 +122,10 @@ impl<R> HasCursor for OneByteReadWrapper<R>
 where
     R: HasCursor,
 {
-    type Cursor<'a> = OneByteReadWrapper<<R as HasCursor>::Cursor<'a>> where R: 'a;
+    type Cursor<'a>
+        = OneByteReadWrapper<<R as HasCursor>::Cursor<'a>>
+    where
+        R: 'a;
 
     fn cursor_at(&self, offset: u64) -> Self::Cursor<'_> {
         OneByteReadWrapper(self.0.cursor_at(offset))

rc-zip/src/corpus/mod.rs

@@ -276,8 +276,8 @@ pub fn check_case(case: &Case, archive: Result<&Archive, &Error>) {
             Err(e) => e,
             Ok(_) => panic!("should have failed"),
         };
-        let expected = format!("{:#?}", expected);
-        let actual = format!("{:#?}", actual);
+        let expected = format!("{expected:#?}");
+        let actual = format!("{actual:#?}");
         assert_eq!(expected, actual);
         return;
     }

rc-zip/src/error.rs

@@ -169,7 +169,7 @@ impl From<Error> for std::io::Error {
     fn from(e: Error) -> Self {
         match e {
             Error::IO(e) => e,
-            e => std::io::Error::new(std::io::ErrorKind::Other, e),
+            e => std::io::Error::other(e),
         }
     }
 }

rc-zip/src/parse/date_time.rs

@@ -24,7 +24,7 @@ pub struct MsdosTimestamp {
 impl fmt::Debug for MsdosTimestamp {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self.to_datetime() {
-            Some(dt) => write!(f, "MsdosTimestamp({})", dt),
+            Some(dt) => write!(f, "MsdosTimestamp({dt})"),
             None => write!(f, "MsdosTimestamp(?)"),
         }
     }
@@ -78,7 +78,7 @@ pub struct NtfsTimestamp {
 impl fmt::Debug for NtfsTimestamp {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self.to_datetime() {
-            Some(dt) => write!(f, "NtfsTimestamp({})", dt),
+            Some(dt) => write!(f, "NtfsTimestamp({dt})"),
             None => write!(f, "NtfsTimestamp(?)"),
         }
     }

rc-zip/src/parse/mode.rs

@@ -99,7 +99,7 @@ impl fmt::Display for Mode {
         let rwx = "rwxrwxrwx";
         for (i, c) in rwx.char_indices() {
             if self.has(Mode(1 << (9 - 1 - i))) {
-                write!(f, "{}", c)?;
+                write!(f, "{c}")?;
             } else {
                 write!(f, "-")?;
             }