fmt

decompals · Apr 27, 2024 · 7730e16 · 7730e16
1 parent a0ab1b9
commit 7730e16
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/slinky/src/document.rs b/slinky/src/document.rs
@@ -6,7 +6,8 @@ use std::{fs, path::Path};
 use serde::Deserialize;
 
 use crate::{
-    absent_nullable::AbsentNullable, segment::SegmentSerial, settings::SettingsSerial, vram_class::VramClassSerial, Segment, Settings, SlinkyError, VramClass
+    absent_nullable::AbsentNullable, segment::SegmentSerial, settings::SettingsSerial,
+    vram_class::VramClassSerial, Segment, Settings, SlinkyError, VramClass,
 };
 
 #[derive(PartialEq, Debug)]
@@ -74,14 +75,18 @@ impl DocumentSerial {
                 for c in v {
                     vram_classes.push(c.unserialize(&settings)?);
                 }
-            },
+            }
         }
 
         let mut segments = Vec::with_capacity(self.segments.len());
         for seg in self.segments {
             segments.push(seg.unserialize(&settings)?);
         }
 
-        Ok(Document { settings, vram_classes, segments })
+        Ok(Document {
+            settings,
+            vram_classes,
+            segments,
+        })
     }
 }
diff --git a/slinky/src/lib.rs b/slinky/src/lib.rs
@@ -28,7 +28,6 @@ pub use file_info::FileInfo;
 pub use file_kind::FileKind;
 pub use segment::Segment;
 
-
 pub use vram_class::VramClass;
 
 pub use document::Document;

diff --git a/slinky/src/segment.rs b/slinky/src/segment.rs
@@ -101,7 +101,9 @@ impl SegmentSerial {
             .follows_segment
             .get_optional_nullable("follows_segment", || None)?;
 
-        let vram_class = self.vram_class.get_optional_nullable("vram_class", || None)?;
+        let vram_class = self
+            .vram_class
+            .get_optional_nullable("vram_class", || None)?;
 
         if fixed_vram.is_some() {
             if follows_segment.is_some() {
@@ -119,13 +121,11 @@ impl SegmentSerial {
             }
         }
 
-        if follows_segment.is_some() {
-            if vram_class.is_some() {
-                return Err(SlinkyError::InvalidFieldCombo {
-                    field1: "follows_segment".to_string(),
-                    field2: "vram_class".to_string(),
-                });
-            }
+        if follows_segment.is_some() && vram_class.is_some() {
+            return Err(SlinkyError::InvalidFieldCombo {
+                field1: "follows_segment".to_string(),
+                field2: "vram_class".to_string(),
+            });
         }
 
         let alloc_sections = self

diff --git a/slinky/src/vram_class.rs b/slinky/src/vram_class.rs
@@ -39,7 +39,9 @@ impl VramClassSerial {
             .fixed_vram
             .get_optional_nullable("fixed_vram", || None)?;
 
-        let follows_classes = self.follows_classes.get_non_null("follows_classes", || Vec::new())?;
+        let follows_classes = self
+            .follows_classes
+            .get_non_null("follows_classes", Vec::new)?;
 
         if fixed_vram.is_some() && !follows_classes.is_empty() {
             return Err(SlinkyError::InvalidFieldCombo {
@@ -49,7 +51,9 @@ impl VramClassSerial {
         }
 
         if fixed_vram.is_none() && follows_classes.is_empty() {
-            return Err(SlinkyError::MissingAnyOfOptionalFields { fields: "'fixed_vram', 'follows_classes'".into() })
+            return Err(SlinkyError::MissingAnyOfOptionalFields {
+                fields: "'fixed_vram', 'follows_classes'".into(),
+            });
         }
 
         Ok(VramClass {