reformat

src/model/game.rs

@@ -9,11 +9,7 @@ use serde::Serialize;
 use serde_json;
 
 use crate::{
-	model::{
-		frame::transpose,
-		shift_jis::MeleeString,
-		slippi,
-	},
+	model::{frame::transpose, shift_jis::MeleeString, slippi},
 	serde::de,
 };
 

src/model/game/mutable.rs

@@ -1,9 +1,6 @@
 use serde_json;
 
-use crate::model::{
-	frame::mutable::Frame,
-	game,
-};
+use crate::model::{frame::mutable::Frame, game};
 
 pub struct Game {
 	pub start: game::Start,

src/serde/de.rs

@@ -98,7 +98,9 @@ impl game::Game for ParseState {
 	}
 
 	fn frame(&self, idx: usize) -> transpose::Frame {
-		self.game.frames.transpose_one(idx, self.game.start.slippi.version)
+		self.game
+			.frames
+			.transpose_one(idx, self.game.start.slippi.version)
 	}
 }
 
@@ -844,8 +846,8 @@ pub fn deserialize<R: Read>(mut r: &mut R, opts: Option<&Opts>) -> Result<Game>
 		0x55 => {
 			parse_metadata(r.by_ref(), &mut state)?;
 			expect_bytes(&mut r, &[0x7d])?;
-		},
-		0x7d => {}, // top-level closing brace ("}")
+		}
+		0x7d => {} // top-level closing brace ("}")
 		x => return Err(err!("expected: 0x55 or 0x7d, got: 0x{:x}", x)),
 	};
 

tests/peppi.rs

@@ -11,11 +11,11 @@ use xxhash_rust::xxh3::xxh3_64;
 use peppi::{
 	model::{
 		frame::transpose,
+		game::immutable::Game,
 		game::{
-			Bytes, DashBack, End, EndMethod, Language, Netplay, Player, PlayerType, Port,
-			Scene, ShieldDrop, Start, Ucf,
+			Bytes, DashBack, End, EndMethod, Language, Netplay, Player, PlayerType, Port, Scene,
+			ShieldDrop, Start, Ucf,
 		},
-		game::immutable::Game,
 		shift_jis::MeleeString,
 		slippi::{Slippi, Version},
 	},