Merge pull request #142 from theseus-rs/correct-lints

chore: correct lint errors

Author: brianheineman

export/pronom/src/main.rs

@@ -30,17 +30,17 @@ fn main() -> Result<()> {
     initialize_tracing();
 
     let mut max_fmt_puid = 2039;
-    if let Ok(fmt_puid) = env::var("MAX_FMT_PUID") {
-        if let Ok(fmt_puid) = fmt_puid.parse::<i64>() {
-            max_fmt_puid = fmt_puid;
-        }
+    if let Ok(fmt_puid) = env::var("MAX_FMT_PUID")
+        && let Ok(fmt_puid) = fmt_puid.parse::<i64>()
+    {
+        max_fmt_puid = fmt_puid;
     }
 
     let mut max_x_fmt_puid = 455;
-    if let Ok(x_fmt_puid) = env::var("MAX_X_FMT_PUID") {
-        if let Ok(x_fmt_puid) = x_fmt_puid.parse::<i64>() {
-            max_x_fmt_puid = x_fmt_puid;
-        }
+    if let Ok(x_fmt_puid) = env::var("MAX_X_FMT_PUID")
+        && let Ok(x_fmt_puid) = x_fmt_puid.parse::<i64>()
+    {
+        max_x_fmt_puid = x_fmt_puid;
     }
 
     let puid_ids = HashMap::from([("fmt", max_fmt_puid), ("x-fmt", max_x_fmt_puid)]);

export/wikidata/src/main.rs

@@ -160,24 +160,22 @@ fn parse_json(json: &Value) -> Vec<FileFormat> {
             .get("extension")
             .and_then(|extension| extension.get("value"))
             .and_then(|extension| extension.as_str())
+            && !extensions.contains(&extension)
         {
-            if !extensions.contains(&extension) {
-                let extension = Box::leak(extension.to_string().into_boxed_str());
-                extensions.push(extension);
-                extensions.sort_unstable();
-            }
+            let extension = Box::leak(extension.to_string().into_boxed_str());
+            extensions.push(extension);
+            extensions.sort_unstable();
         }
 
         if let Some(media_type) = binding
             .get("mediaType")
             .and_then(|media_type| media_type.get("value"))
             .and_then(|media_type| media_type.as_str())
+            && !media_types.contains(&media_type)
         {
-            if !media_types.contains(&media_type) {
-                let media_type = Box::leak(media_type.to_string().into_boxed_str());
-                media_types.push(media_type);
-                media_types.sort_unstable();
-            }
+            let media_type = Box::leak(media_type.to_string().into_boxed_str());
+            media_types.push(media_type);
+            media_types.sort_unstable();
         }
 
         if let Some(file_signature) = binding

file_type/src/file_type.rs

@@ -225,7 +225,7 @@ impl Ord for FileType {
 
 impl PartialOrd for FileType {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.file_format.cmp(other.file_format))
+        Some(self.cmp(other))
     }
 }
 

file_type/src/format/file_format.rs

@@ -30,7 +30,7 @@ impl SourceType {
 
 impl PartialOrd for SourceType {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.priority().cmp(&other.priority()))
+        Some(self.cmp(other))
     }
 }
 

file_type/src/format/signature.rs

@@ -15,12 +15,12 @@ impl Signature {
     #[must_use]
     pub fn key(&self) -> u64 {
         for byte_sequence in self.byte_sequences {
-            if byte_sequence.position_type == PositionType::BOF {
-                if let Some(0) = byte_sequence.offset {
-                    let key = byte_sequence.regex.key();
-                    if key != 0 {
-                        return key;
-                    }
+            if byte_sequence.position_type == PositionType::BOF
+                && let Some(0) = byte_sequence.offset
+            {
+                let key = byte_sequence.regex.key();
+                if key != 0 {
+                    return key;
                 }
             }
         }