rustfmt

spacestation13 · Jul 8, 2024 · 11230d4 · 11230d4
1 parent 5ddfbd8
commit 11230d4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/hypnagogic_core/src/operations/cutters/bitmask_dir_visibility.rs b/hypnagogic_core/src/operations/cutters/bitmask_dir_visibility.rs
@@ -66,7 +66,12 @@ impl IconOperationConfig for BitmaskDirectionalVis {
             .animation
             .clone()
             .map(|x| repeat_for(&x.delays, num_frames as usize));
-        let rewind = self.bitmask_slice_config.animation.as_ref().and_then(|animation| animation.rewind).unwrap_or(false);
+        let rewind = self
+            .bitmask_slice_config
+            .animation
+            .as_ref()
+            .and_then(|animation| animation.rewind)
+            .unwrap_or(false);
 
         let mut icon_states = vec![];
 
@@ -112,7 +117,7 @@ impl IconOperationConfig for BitmaskDirectionalVis {
                     frames: num_frames,
                     images: icon_state_frames,
                     delay: delay.clone(),
-                    rewind: rewind,
+                    rewind,
                     ..Default::default()
                 }));
             }
@@ -155,7 +160,7 @@ impl IconOperationConfig for BitmaskDirectionalVis {
                 frames: num_frames,
                 images: icon_state_frames,
                 delay: delay.clone(),
-                rewind: rewind,
+                rewind,
 
                 ..Default::default()
             }));

diff --git a/hypnagogic_core/src/operations/cutters/bitmask_slice.rs b/hypnagogic_core/src/operations/cutters/bitmask_slice.rs
@@ -113,7 +113,11 @@ impl IconOperationConfig for BitmaskSlice {
             .animation
             .clone()
             .map(|x| repeat_for(&x.delays, num_frames as usize));
-        let rewind = self.animation.as_ref().and_then(|animation| animation.rewind).unwrap_or(false);
+        let rewind = self
+            .animation
+            .as_ref()
+            .and_then(|animation| animation.rewind)
+            .unwrap_or(false);
 
         let states_to_gen = (0..possible_states)
             .map(|x| Adjacency::from_bits(x as u8).unwrap())
@@ -139,7 +143,7 @@ impl IconOperationConfig for BitmaskSlice {
                 frames: num_frames,
                 images: icon_state_frames,
                 delay: delay.clone(),
-                rewind: rewind,
+                rewind,
                 ..Default::default()
             }));
         }

diff --git a/hypnagogic_core/src/operations/cutters/bitmask_windows.rs b/hypnagogic_core/src/operations/cutters/bitmask_windows.rs
@@ -92,7 +92,11 @@ impl IconOperationConfig for BitmaskWindows {
             .animation
             .clone()
             .map(|x| repeat_for(&x.delays, num_frames as usize));
-        let rewind = self.animation.as_ref().and_then(|animation| animation.rewind).unwrap_or(false);
+        let rewind = self
+            .animation
+            .as_ref()
+            .and_then(|animation| animation.rewind)
+            .unwrap_or(false);
 
         let mut states = vec![];
 
@@ -133,7 +137,7 @@ impl IconOperationConfig for BitmaskWindows {
                     frames: num_frames,
                     images: upper_frames,
                     delay: delay.clone(),
-                    rewind: rewind,
+                    rewind,
                     ..Default::default()
                 }));
                 states.push(dedupe_frames(IconState {
@@ -142,7 +146,7 @@ impl IconOperationConfig for BitmaskWindows {
                     frames: num_frames,
                     images: lower_frames,
                     delay: delay.clone(),
-                    rewind: rewind,
+                    rewind,
                     ..Default::default()
                 }));
             };

diff --git a/hypnagogic_core/src/operations/format_converter/bitmask_to_precut.rs b/hypnagogic_core/src/operations/format_converter/bitmask_to_precut.rs
@@ -161,7 +161,10 @@ impl IconOperationConfig for BitmaskSliceReconstruct {
         let delays: Option<Vec<f32>> = trimmed_frames
             .first()
             .and_then(|first_frame| first_frame.delay.clone());
-        let rewind = trimmed_frames.first().and_then(|first_frame| Some(first_frame.rewind)).unwrap_or(false);
+        let rewind = trimmed_frames
+            .first()
+            .and_then(|first_frame| Some(first_frame.rewind))
+            .unwrap_or(false);
 
         let mut problem_states: Vec<InconsistentDelay> = vec![];
         for (x, state) in trimmed_frames.into_iter().enumerate() {