Merge pull request #281 from brxken128/clippy-fix

brxken128 · web-flow · commit 5bb93ba13ab1 · 2023-06-17T11:06:12.000+01:00
fix clippy (and stop using `deny`)
diff --git a/dexios-core/src/lib.rs b/dexios-core/src/lib.rs
@@ -33,7 +33,7 @@
 //!
 //! Dexios-Core exclusively uses AEADs provided by the [RustCrypto Team](https://github.com/RustCrypto), so I'd like to give them a huge thank you for their hard work (this wouldn't have been possible without them!)
 #![forbid(unsafe_code)]
-#![deny(clippy::all)]
+#![warn(clippy::all)]
 
 pub const CORE_VERSION: &str = env!("CARGO_PKG_VERSION");
 
diff --git a/dexios-domain/src/encrypt.rs b/dexios-domain/src/encrypt.rs
@@ -261,7 +261,7 @@ pub mod tests {
                 assert_eq!(output_content, V4_ENCRYPTED_CONTENT.to_vec());
             }
             Err(e) => {
-                println!("{:?}", e);
+                println!("{e:?}");
                 unreachable!()
             }
         }
@@ -293,7 +293,7 @@ pub mod tests {
                 assert_eq!(output_content, V5_ENCRYPTED_CONTENT.to_vec());
             }
             Err(e) => {
-                println!("{:?}", e);
+                println!("{e:?}");
                 unreachable!()
             }
         }
@@ -329,7 +329,7 @@ pub mod tests {
                 assert_eq!(output_header, V5_ENCRYPTED_DETACHED_HEADER.to_vec());
             }
             Err(e) => {
-                println!("{:?}", e);
+                println!("{e:?}");
                 unreachable!()
             }
         }
diff --git a/dexios-domain/src/erase.rs b/dexios-domain/src/erase.rs
@@ -19,7 +19,7 @@ impl std::fmt::Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Error::OpenFile => f.write_str("Unable to open file"),
-            Error::Overwrite(inner) => write!(f, "Unable to overwrite file: {}", inner),
+            Error::Overwrite(inner) => write!(f, "Unable to overwrite file: {inner}"),
             Error::RemoveFile => f.write_str("Unable to remove file"),
         }
     }
diff --git a/dexios-domain/src/erase_dir.rs b/dexios-domain/src/erase_dir.rs
@@ -19,7 +19,7 @@ impl std::fmt::Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Error::InvalidFileType => f.write_str("Invalid file type"),
-            Error::EraseFile(inner) => write!(f, "Unable to erase file: {}", inner),
+            Error::EraseFile(inner) => write!(f, "Unable to erase file: {inner}"),
             Error::ReadDirEntries => f.write_str("Unable to get all dir entries"),
             Error::RemoveDir => f.write_str("Unable to remove directory recursively"),
         }
diff --git a/dexios-domain/src/lib.rs b/dexios-domain/src/lib.rs
@@ -32,24 +32,23 @@
 //! You can read more about Dexios, Dexios-Core, Dexios-Domain and the technical details [in the project's main documentation](https://brxken128.github.io/dexios/)!
 //!
 
-// Rustc lints
+// lints
 #![forbid(unsafe_code)]
-#![deny(
+#![warn(
     rust_2018_idioms,
     non_ascii_idents,
     unstable_features,
     unused_imports,
-    unused_qualifications
+    unused_qualifications,
+    clippy::pedantic,
+    clippy::all
 )]
-// Clippy lints
-#![deny(clippy::pedantic, clippy::all)]
 #![allow(
     clippy::module_name_repetitions,
     clippy::similar_names,
     clippy::needless_pass_by_value,
-    // yet
     clippy::missing_panics_doc,
-    clippy::missing_errors_doc,
+    clippy::missing_errors_doc
 )]
 
 pub mod decrypt;
diff --git a/dexios-domain/src/pack.rs b/dexios-domain/src/pack.rs
@@ -35,7 +35,7 @@ impl std::fmt::Display for Error {
             Error::FinishArchive => f.write_str("Unable to finish archive"),
             Error::ReadData => f.write_str("Unable to read data"),
             Error::WriteData => f.write_str("Unable to write data"),
-            Error::Encrypt(inner) => write!(f, "Unable to encrypt archive: {}", inner),
+            Error::Encrypt(inner) => write!(f, "Unable to encrypt archive: {inner}"),
         }
     }
 }
diff --git a/dexios-domain/src/storage.rs b/dexios-domain/src/storage.rs
@@ -37,7 +37,7 @@ impl std::fmt::Display for Error {
         match self {
             Error::CreateDir => f.write_str("Unable to create a new directory"),
             Error::CreateFile => f.write_str("Unable to create a new file"),
-            Error::OpenFile(mode) => write!(f, "Unable to read the file in {:?} mode", mode),
+            Error::OpenFile(mode) => write!(f, "Unable to read the file in {mode:?} mode"),
             Error::FlushFile => f.write_str("Unable to flush the file"),
             Error::RemoveFile => f.write_str("Unable to remove the file"),
             Error::RemoveDir => f.write_str("Unable to remove dir"),
@@ -457,7 +457,7 @@ where
 mod tests {
     use super::*;
 
-    fn sorted_file_names(file_names: Vec<&PathBuf>) -> Vec<&str> {
+    fn sorted_file_names(file_names: &[PathBuf]) -> Vec<&str> {
         let mut keys = file_names
             .iter()
             .map(|k| k.to_str().unwrap())
@@ -651,9 +651,9 @@ mod tests {
             Ok(()) => {
                 assert_eq!(stor.files().get(&file_path).cloned(), None);
                 let files = stor.files();
-                let keys = files.keys().collect::<Vec<_>>();
+                let keys = files.keys().cloned().collect::<Vec<_>>();
                 assert_eq!(
-                    sorted_file_names(keys),
+                    sorted_file_names(&keys),
                     vec!["bar/", "bar/hello.txt", "bar/world.txt", "hello.txt"]
                 );
             }
@@ -674,8 +674,8 @@ mod tests {
             Ok(()) => {
                 assert_eq!(stor.files().get(&file_path).cloned(), None);
                 let files = stor.files();
-                let keys = files.keys().collect();
-                assert_eq!(sorted_file_names(keys), vec!["hello.txt"]);
+                let keys = files.keys().cloned().collect::<Vec<PathBuf>>();
+                assert_eq!(sorted_file_names(&keys), vec!["hello.txt"]);
             }
             _ => unreachable!(),
         }
@@ -696,7 +696,7 @@ mod tests {
                     .map(|f| f.path().to_path_buf())
                     .collect::<Vec<_>>();
                 assert_eq!(
-                    sorted_file_names(file_names.iter().collect()),
+                    sorted_file_names(&file_names),
                     vec![
                         "bar/",
                         "bar/foo/",
@@ -722,11 +722,11 @@ mod tests {
         match stor.read_dir(&file) {
             Ok(files) => {
                 let file_names = files
-                    .iter()
+                    .into_iter()
                     .map(|f| f.path().to_path_buf())
                     .collect::<Vec<_>>();
                 assert_eq!(
-                    sorted_file_names(file_names.iter().collect()),
+                    sorted_file_names(&file_names),
                     vec![
                         "bar/",
                         "bar/.foo/",
diff --git a/dexios-domain/src/unpack.rs b/dexios-domain/src/unpack.rs
@@ -28,8 +28,8 @@ impl std::fmt::Display for Error {
             Error::OpenArchive => f.write_str("Unable to open archive"),
             Error::OpenArchivedFile => f.write_str("Unable to open archived file"),
             Error::ResetCursorPosition => f.write_str("Unable to reset cursor position"),
-            Error::Storage(inner) => write!(f, "Storage error: {}", inner),
-            Error::Decrypt(inner) => write!(f, "Decrypt error: {}", inner),
+            Error::Storage(inner) => write!(f, "Storage error: {inner}"),
+            Error::Decrypt(inner) => write!(f, "Decrypt error: {inner}"),
         }
     }
 }
diff --git a/dexios-domain/src/utils.rs b/dexios-domain/src/utils.rs
@@ -37,7 +37,7 @@ mod test {
 pub fn hex_encode(bytes: &[u8]) -> String {
     bytes
         .iter()
-        .map(|b| format!("{:02x}", b))
+        .map(|b| format!("{b:02x}"))
         .collect::<String>()
 }
 
diff --git a/dexios/src/global/parameters.rs b/dexios/src/global/parameters.rs
@@ -16,8 +16,7 @@ use super::structs::KeyManipulationParams;
 pub fn get_params(name: &str, sub_matches: &ArgMatches) -> Result<Vec<String>> {
     let values = sub_matches
         .get_many::<String>(name)
-        .with_context(|| format!("No {} provided", name))?
-        .into_iter()
+        .with_context(|| format!("No {name} provided"))?
         .map(String::from)
         .collect();
     Ok(values)
diff --git a/dexios/src/main.rs b/dexios/src/main.rs
@@ -1,5 +1,5 @@
 #![forbid(unsafe_code)]
-#![deny(clippy::all)]
+#![warn(clippy::all)]
 
 use anyhow::Result;
 

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ pub mod tests {`
`261`	`261`	`assert_eq!(output_content, V4_ENCRYPTED_CONTENT.to_vec());`
`262`	`262`	`}`
`263`	`263`	`Err(e) => {`
`264`		`- println!("{:?}", e);`
	`264`	`+ println!("{e:?}");`
`265`	`265`	`unreachable!()`
`266`	`266`	`}`
`267`	`267`	`}`
`@@ -293,7 +293,7 @@ pub mod tests {`
`293`	`293`	`assert_eq!(output_content, V5_ENCRYPTED_CONTENT.to_vec());`
`294`	`294`	`}`
`295`	`295`	`Err(e) => {`
`296`		`- println!("{:?}", e);`
	`296`	`+ println!("{e:?}");`
`297`	`297`	`unreachable!()`
`298`	`298`	`}`
`299`	`299`	`}`
`@@ -329,7 +329,7 @@ pub mod tests {`
`329`	`329`	`assert_eq!(output_header, V5_ENCRYPTED_DETACHED_HEADER.to_vec());`
`330`	`330`	`}`
`331`	`331`	`Err(e) => {`
`332`		`- println!("{:?}", e);`
	`332`	`+ println!("{e:?}");`
`333`	`333`	`unreachable!()`
`334`	`334`	`}`
`335`	`335`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ impl std::fmt::Display for Error {`
`19`	`19`	`fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {`
`20`	`20`	`match self {`
`21`	`21`	`Error::OpenFile => f.write_str("Unable to open file"),`
`22`		`- Error::Overwrite(inner) => write!(f, "Unable to overwrite file: {}", inner),`
	`22`	`+ Error::Overwrite(inner) => write!(f, "Unable to overwrite file: {inner}"),`
`23`	`23`	`Error::RemoveFile => f.write_str("Unable to remove file"),`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ impl std::fmt::Display for Error {`
`35`	`35`	`Error::FinishArchive => f.write_str("Unable to finish archive"),`
`36`	`36`	`Error::ReadData => f.write_str("Unable to read data"),`
`37`	`37`	`Error::WriteData => f.write_str("Unable to write data"),`
`38`		`- Error::Encrypt(inner) => write!(f, "Unable to encrypt archive: {}", inner),`
	`38`	`+ Error::Encrypt(inner) => write!(f, "Unable to encrypt archive: {inner}"),`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ impl std::fmt::Display for Error {`
`28`	`28`	`Error::OpenArchive => f.write_str("Unable to open archive"),`
`29`	`29`	`Error::OpenArchivedFile => f.write_str("Unable to open archived file"),`
`30`	`30`	`Error::ResetCursorPosition => f.write_str("Unable to reset cursor position"),`
`31`		`- Error::Storage(inner) => write!(f, "Storage error: {}", inner),`
`32`		`- Error::Decrypt(inner) => write!(f, "Decrypt error: {}", inner),`
	`31`	`+ Error::Storage(inner) => write!(f, "Storage error: {inner}"),`
	`32`	`+ Error::Decrypt(inner) => write!(f, "Decrypt error: {inner}"),`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ mod test {`
`37`	`37`	`pub fn hex_encode(bytes: &[u8]) -> String {`
`38`	`38`	`bytes`
`39`	`39`	`.iter()`
`40`		`- .map(\|b\| format!("{:02x}", b))`
	`40`	`+ .map(\|b\| format!("{b:02x}"))`
`41`	`41`	`.collect::<String>()`
`42`	`42`	`}`
`43`	`43`