diff --git a/src/game/bytes.rs b/src/game/bytes.rs index a22b57c..e6aee79 100644 --- a/src/game/bytes.rs +++ b/src/game/bytes.rs @@ -1,6 +1,6 @@ //! Interface for converting various structures to and from bytes -// Std +// Imports use std::{error::Error, fmt::Debug}; /// Conversions to and from bytes for the game file diff --git a/src/game/card/digimon.rs b/src/game/card/digimon.rs index 93d4f1a..e22fb85 100644 --- a/src/game/card/digimon.rs +++ b/src/game/card/digimon.rs @@ -1,13 +1,11 @@ #![doc(include = "digimon.md")] -// byteorder -use byteorder::{ByteOrder, LittleEndian}; - -// Crate +// Imports use crate::game::{ card::property::{self, ArrowColor, CrossMoveEffect, Effect, EffectCondition, Level, Move, Speciality}, util, Bytes, }; +use byteorder::{ByteOrder, LittleEndian}; /// A digimon card /// diff --git a/src/game/card/digivolve.rs b/src/game/card/digivolve.rs index 3e84f2f..c608e83 100644 --- a/src/game/card/digivolve.rs +++ b/src/game/card/digivolve.rs @@ -1,6 +1,6 @@ #![doc(include = "digivolve.md")] -// Crate +// Imports use crate::game::{util, Bytes}; /// A digivolve card diff --git a/src/game/card/item.rs b/src/game/card/item.rs index 7879317..5b09bea 100644 --- a/src/game/card/item.rs +++ b/src/game/card/item.rs @@ -1,13 +1,11 @@ #![doc(include = "item.md")] -// byteorder -use byteorder::{ByteOrder, LittleEndian}; - -// Crate +// Imports use crate::game::{ card::property::{self, ArrowColor, Effect, EffectCondition}, util, Bytes, }; +use byteorder::{ByteOrder, LittleEndian}; /// An item card /// diff --git a/src/game/card/property/effect.rs b/src/game/card/property/effect.rs index ee80b0b..617e760 100644 --- a/src/game/card/property/effect.rs +++ b/src/game/card/property/effect.rs @@ -1,13 +1,11 @@ #![doc(include = "effect.md")] -// byteorder -use byteorder::{ByteOrder, LittleEndian}; - -// Crate +// Imports use crate::game::{ card::property::{self, AttackType, DigimonProperty, EffectOperation, PlayerType, Slot}, util, Bytes, }; +use byteorder::{ByteOrder, LittleEndian}; /// A digimon's support effects /// diff --git a/src/game/card/property/effect_condition.rs b/src/game/card/property/effect_condition.rs index 45a214f..c372ffa 100644 --- a/src/game/card/property/effect_condition.rs +++ b/src/game/card/property/effect_condition.rs @@ -1,13 +1,11 @@ #![doc(include = "effect_condition.md")] -// byteorder -use byteorder::{ByteOrder, LittleEndian}; - -// Crate +// Imports use crate::game::{ card::property::{self, DigimonProperty, EffectConditionOperation}, util, Bytes, }; +use byteorder::{ByteOrder, LittleEndian}; /// A digimon's support effect condition #[derive(PartialEq, Eq, Clone, Copy, Hash, Debug)] diff --git a/src/game/card/property/moves.rs b/src/game/card/property/moves.rs index 1f3167c..7e622fd 100644 --- a/src/game/card/property/moves.rs +++ b/src/game/card/property/moves.rs @@ -4,11 +4,9 @@ #[cfg(test)] mod test; -// byteorder -use byteorder::{ByteOrder, LittleEndian}; - -// Crate +// Imports use crate::game::{util, Bytes}; +use byteorder::{ByteOrder, LittleEndian}; /// A digimon's move #[derive(PartialEq, Eq, Clone, Hash, Debug)] diff --git a/src/game/card/table.rs b/src/game/card/table.rs index 9740ca1..4eeaa19 100644 --- a/src/game/card/table.rs +++ b/src/game/card/table.rs @@ -1,12 +1,6 @@ #![doc(include = "table.md")] -// Std -use std::io::{Read, Seek, Write}; - -// byteorder -use byteorder::{ByteOrder, LittleEndian}; - -// Crate +// Imports use crate::{ game::{ card::{ @@ -18,6 +12,8 @@ use crate::{ }, io::{address::Data, GameFile}, }; +use byteorder::{ByteOrder, LittleEndian}; +use std::io::{Read, Seek, Write}; /// The table storing all cards #[derive(Debug)] diff --git a/src/game/deck/deck.rs b/src/game/deck/deck.rs index 7a878be..bea4b75 100644 --- a/src/game/deck/deck.rs +++ b/src/game/deck/deck.rs @@ -1,10 +1,8 @@ //! Decks -// byteorder -use byteorder::{ByteOrder, LittleEndian}; - -// Crate +// Imports use crate::game::{util, Bytes}; +use byteorder::{ByteOrder, LittleEndian}; /// A deck #[derive(Debug)] diff --git a/src/game/deck/table.rs b/src/game/deck/table.rs index 8e975b6..5c607b3 100644 --- a/src/game/deck/table.rs +++ b/src/game/deck/table.rs @@ -1,13 +1,11 @@ //! The table of all decks in the game -// Std -use std::io::{Read, Seek, Write}; - -// Crate +// Imports use crate::{ game::{deck::deck, Bytes, Deck}, io::{address::Data, GameFile}, }; +use std::io::{Read, Seek, Write}; /// The decks table, where all decks are stored /// diff --git a/src/io/address/data.rs b/src/io/address/data.rs index b3de59d..dd2b8b1 100644 --- a/src/io/address/data.rs +++ b/src/io/address/data.rs @@ -1,6 +1,6 @@ //! File data-only addresses -// Address +// Imports use crate::io::address::Real; /// A type for defining addresses on the data parts of `.bin` file. diff --git a/src/io/game_file.rs b/src/io/game_file.rs index 5eaf353..8278211 100644 --- a/src/io/game_file.rs +++ b/src/io/game_file.rs @@ -2,10 +2,8 @@ //! //! See [`GameFile`] for details -// Addresses +// Imports use crate::io::address::{Data as DataAddress, Real as RealAddress, RealToDataError}; - -// Read / Write use std::io::{Read, Seek, Write}; /// A type that abstracts over a the game reader.