All files have been run through cargo fmt after dcb-util -> zutil change.

dcb-cdrom-xa/src/sector/header/address.rs

@@ -7,8 +7,8 @@ mod error;
 pub use error::{DeserializeBytesError, FromSectorPosError, SerializeBytesError};
 
 // Imports
-use zutil::BcdU8;
 use std::{convert::TryFrom, ops::Range};
+use zutil::BcdU8;
 
 /// Sector address
 // TODO: All of these are BCD, read and write them them as such.

dcb-drv/src/entry.rs

@@ -12,8 +12,8 @@ use super::ptr::{DirPtr, FilePtr};
 use byteorder::{ByteOrder, LittleEndian};
 use chrono::NaiveDateTime;
 use dcb_bytes::Bytes;
-use zutil::{ascii_str_arr::AsciiChar, AsciiStrArr};
 use std::convert::TryInto;
+use zutil::{ascii_str_arr::AsciiChar, AsciiStrArr};
 
 /// A directory entry kind
 #[derive(PartialEq, Eq, Clone, Debug)]

dcb-drv/src/ptr.rs

@@ -14,8 +14,8 @@ use crate::{path, DirEntryKind, Path};
 use ascii::AsciiStr;
 use core::str::lossy::Utf8Lossy;
 use dcb_bytes::Bytes;
-use zutil::IoSlice;
 use std::io::{self, SeekFrom};
+use zutil::IoSlice;
 
 /// File pointer
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]

dcb-drv/src/writer.rs

@@ -3,11 +3,11 @@
 // Imports
 use crate::{DirEntry, DirEntryKind, DirPtr, FilePtr};
 use chrono::NaiveDateTime;
-use zutil::{AsciiStrArr, MapBoxResult};
 use std::{
 	convert::TryInto,
 	io::{self, SeekFrom},
 };
+use zutil::{AsciiStrArr, MapBoxResult};
 
 /// A directory lister
 pub trait DirWriterLister:

dcb-exe/src/inst/directive.rs

@@ -4,11 +4,11 @@
 use super::{parse::LineArg, DisplayCtx, InstDisplay, InstFmtArg, InstSize, Parsable, ParseCtx, ParseError};
 use crate::{DataType, Pos};
 use ascii::{AsciiChar, AsciiStr};
-use zutil::NextFromBytes;
 use std::{
 	array,
 	io::{self, Write},
 };
+use zutil::NextFromBytes;
 
 /// A directive
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]

dcb-exe/src/inst/fmt.rs

@@ -4,9 +4,9 @@
 
 // Imports
 use crate::{inst::Register, Pos};
-use zutil::SignedHex;
 use itertools::Itertools;
 use std::fmt;
+use zutil::SignedHex;
 
 /// Instruction display
 // TODO: Move `'a` to gat once they are implemented

dcb-io/src/game_file.rs

@@ -12,8 +12,8 @@ pub use path::Path;
 
 // Imports
 use dcb_drv::DirEntryKind;
-use zutil::IoSlice;
 use std::io;
+use zutil::IoSlice;
 
 /// Game file.
 #[derive(PartialEq, Clone, Debug)]

dcb-pak/src/reader/entry/animation2d.rs

@@ -11,8 +11,8 @@ pub use frame::Frame;
 // Imports
 use byteorder::{ByteOrder, LittleEndian};
 use dcb_bytes::Bytes;
-use zutil::{null_ascii_string::NullAsciiString, AsciiStrArr};
 use std::io;
+use zutil::{null_ascii_string::NullAsciiString, AsciiStrArr};
 
 /// 2D Animation data
 #[derive(PartialEq, Eq, Clone, Debug)]

dcb-pak/src/reader/entry/animation2d/error.rs

@@ -1,8 +1,8 @@
 //! Errors
 
 // Imports
-use zutil::null_ascii_string;
 use std::io;
+use zutil::null_ascii_string;
 
 /// Error for [`Animation2d::deserialize`](super::Animation2d::deserialize)
 #[derive(Debug, thiserror::Error)]

dcb-pak/src/reader/entry/model3d_set.rs

@@ -10,8 +10,8 @@ pub use model::TmdModel;
 
 // Imports
 use byteorder::{ByteOrder, LittleEndian};
-use zutil::{null_ascii_string::NullAsciiString, AsciiStrArr};
 use std::{convert::TryFrom, io};
+use zutil::{null_ascii_string::NullAsciiString, AsciiStrArr};
 
 /// 3D Model set
 #[derive(PartialEq, Eq, Clone, Debug)]

dcb-pak/src/reader/entry/model3d_set/error.rs

@@ -2,8 +2,8 @@
 
 // Imports
 use super::model;
-use zutil::null_ascii_string;
 use std::io;
+use zutil::null_ascii_string;
 
 /// Error for [`Model3dSet::from_reader`](super::Model3dSet::from_reader)
 #[derive(Debug, thiserror::Error)]

dcb-tools/dcb-as/src/main.rs

@@ -16,7 +16,6 @@ use dcb_exe::{
 	},
 	Data, DataType, Pos,
 };
-use zutil::{AsciiStrArr, BTreeMapVector};
 use std::{
 	collections::{BTreeMap, HashMap},
 	convert::TryInto,
@@ -26,6 +25,7 @@ use std::{
 	rc::Rc,
 	str::FromStr,
 };
+use zutil::{AsciiStrArr, BTreeMapVector};
 
 fn main() -> Result<(), anyhow::Error> {
 	// Initialize the logger

dcb-tools/dcb-card-editor/src/loaded_game.rs

@@ -6,7 +6,6 @@ use crate::EditScreen;
 use anyhow::Context;
 use dcb::CardTable;
 use dcb_cdrom_xa::CdRomCursor;
-use zutil::StrContainsCaseInsensitive;
 use eframe::{egui, epi::TextureAllocator};
 use std::{
 	convert::TryInto,
@@ -14,6 +13,7 @@ use std::{
 	io::{Seek, Write},
 	path::{Path, PathBuf},
 };
+use zutil::StrContainsCaseInsensitive;
 
 /// Loaded game
 pub struct LoadedGame {

dcb-tools/dcb-card-editor/src/main.rs

@@ -31,7 +31,6 @@ use dcb::card::{
 	Card,
 };
 use dcb_bytes::Validate;
-use zutil::{alert, AsciiTextBuffer, StrContainsCaseInsensitive};
 use diff_screen::DiffScreen;
 use edit_screen::EditScreen;
 use eframe::{egui, epi, NativeOptions};
@@ -49,6 +48,7 @@ use std::{
 };
 use strum::IntoEnumIterator;
 use swap_screen::SwapScreen;
+use zutil::{alert, AsciiTextBuffer, StrContainsCaseInsensitive};
 
 fn main() {
 	// Initialize the logger

dcb-tools/dcb-deck-editor/src/main.rs

@@ -6,7 +6,6 @@
 // Imports
 use anyhow::Context;
 use dcb::{CardTable, Deck, DeckTable};
-use zutil::{AsciiTextBuffer, StrContainsCaseInsensitive};
 use eframe::{egui, epi, NativeOptions};
 use native_dialog::{FileDialog, MessageDialog, MessageType};
 use ref_cast::RefCast;
@@ -16,6 +15,7 @@ use std::{
 	io::{self, Read, Seek},
 	path::{Path, PathBuf},
 };
+use zutil::{AsciiTextBuffer, StrContainsCaseInsensitive};
 
 fn main() {
 	// Initialize the logger

dcb-tools/dcb-file-editor/src/drv_tree.rs

@@ -3,9 +3,9 @@
 // Imports
 use anyhow::Context;
 use dcb_drv::{DirEntry, DirEntryKind, DirPtr, FilePtr};
-use zutil::{AsciiStrArr, StrContainsCaseInsensitive};
 use eframe::egui;
 use std::io;
+use zutil::{AsciiStrArr, StrContainsCaseInsensitive};
 
 /// Drv tree
 pub struct DrvTree {

dcb-tools/dcb-file-editor/src/game_file.rs

@@ -6,13 +6,13 @@ use crate::{
 };
 use anyhow::Context;
 use dcb_cdrom_xa::CdRomCursor;
-use zutil::MutexPoison;
 use eframe::egui;
 use std::{
 	fs,
 	io::{self, Write},
 	sync::Mutex,
 };
+use zutil::MutexPoison;
 
 /// Game file
 pub struct GameFile {

dcb-tools/dcb-file-editor/src/main.rs

@@ -20,13 +20,13 @@ pub mod swap_window;
 
 // Imports
 use anyhow::Context;
-use zutil::{alert, task, Void};
 use eframe::{egui, epi, NativeOptions};
 use game_file::GameFile;
 use native_dialog::FileDialog;
 use preview_panel::{PreviewPanel, PreviewPanelBuilder};
 use std::{fs, path::PathBuf, sync::Arc, thread};
 use swap_window::SwapWindow;
+use zutil::{alert, task, Void};
 
 fn main() {
 	// Initialize the logger

dcb-tools/dcb-file-editor/src/preview_panel.rs

@@ -6,12 +6,12 @@ use anyhow::Context;
 use dcb_io::game_file::Path;
 use dcb_pak::PakFileReader;
 use dcb_tim::{Tim, Tis};
-use zutil::task::{self, ValueFuture};
 use eframe::{
 	egui::{self, Color32, TextureId},
 	epi::TextureAllocator,
 };
 use std::{collections::BTreeMap, io::BufReader, sync::Arc};
+use zutil::task::{self, ValueFuture};
 
 /// Preview panel
 #[derive(PartialEq, Clone)]

dcb-tools/dcb-file-editor/src/swap_window.rs

@@ -4,9 +4,9 @@
 use crate::GameFile;
 use anyhow::Context;
 use dcb_io::game_file::Path;
-use zutil::{alert, task};
 use eframe::egui;
 use std::{mem, sync::Arc};
+use zutil::{alert, task};
 
 /// Swap window
 #[derive(PartialEq, Clone, Default)]

dcb/src/card/card.rs

@@ -10,8 +10,8 @@ pub use error::{DeserializeError, SerializeError};
 use super::property::CardType;
 use crate::{Digimon, Digivolve, Item};
 use dcb_bytes::{BytesReadExt, BytesWriteExt};
-use zutil::AsciiStrArr;
 use std::io;
+use zutil::AsciiStrArr;
 
 /// A card
 #[derive(PartialEq, Eq, Clone, Copy, Hash, Debug)]

dcb/src/card/digimon.rs

@@ -15,9 +15,9 @@ use crate::card::property::{
 };
 use byteorder::{ByteOrder, LittleEndian};
 use dcb_bytes::Bytes;
-use zutil::{null_ascii_string::NullAsciiString, AsciiStrArr};
 use ref_cast::RefCast;
 use std::{iter, ops::Try};
+use zutil::{null_ascii_string::NullAsciiString, AsciiStrArr};
 
 /// A digimon card
 ///

dcb/src/card/digimon/diff.rs

@@ -4,8 +4,8 @@
 use crate::card::property::{
 	ArrowColor, AttackType, CrossMoveEffect, Effect, EffectCondition, Level, Move, Speciality,
 };
-use zutil::{AsciiStrArr, TryOrEmpty};
 use std::ops::Try;
+use zutil::{AsciiStrArr, TryOrEmpty};
 
 /// Visitor trait for differences between two digimon
 pub trait DiffVisitor {

dcb/src/card/digivolve.rs

@@ -11,8 +11,8 @@ pub use error::DeserializeBytesError;
 // Imports
 use crate::card::property::DigivolveEffect;
 use dcb_bytes::Bytes;
-use zutil::{null_ascii_string::NullAsciiString, AsciiStrArr};
 use std::{iter, ops::Try};
+use zutil::{null_ascii_string::NullAsciiString, AsciiStrArr};
 
 /// A digivolve card
 ///

dcb/src/card/digivolve/diff.rs

@@ -2,8 +2,8 @@
 
 // Imports
 use crate::card::property::DigivolveEffect;
-use zutil::{AsciiStrArr, TryOrEmpty};
 use std::ops::Try;
+use zutil::{AsciiStrArr, TryOrEmpty};
 
 /// Visitor trait for differences between two digivolves
 pub trait DiffVisitor {

dcb/src/card/item.rs

@@ -12,9 +12,9 @@ pub use error::{DeserializeBytesError, SerializeBytesError};
 use crate::card::property::{ArrowColor, Effect, EffectCondition, MaybeArrowColor, MaybeEffect, MaybeEffectCondition};
 use byteorder::{ByteOrder, LittleEndian};
 use dcb_bytes::Bytes;
-use zutil::{null_ascii_string::NullAsciiString, AsciiStrArr};
 use ref_cast::RefCast;
 use std::{iter, ops::Try};
+use zutil::{null_ascii_string::NullAsciiString, AsciiStrArr};
 
 /// An item card
 ///

dcb/src/card/item/diff.rs

@@ -2,8 +2,8 @@
 
 // Imports
 use crate::card::property::{ArrowColor, Effect, EffectCondition};
-use zutil::{AsciiStrArr, TryOrEmpty};
 use std::ops::Try;
+use zutil::{AsciiStrArr, TryOrEmpty};
 
 /// Visitor trait for differences between two items
 pub trait DiffVisitor {

dcb/src/card/table.rs

@@ -17,8 +17,8 @@ use dcb_io::{
 	game_file::{OpenFileError, Path},
 	GameFile,
 };
-use zutil::IoSlice;
 use std::{convert::TryInto, io};
+use zutil::IoSlice;
 
 /// Table storing all cards.
 #[derive(PartialEq, Eq, Clone, Hash, Debug)]

dcb/src/deck/deck.rs

@@ -4,11 +4,11 @@
 use crate::deck::{armor_evo, city, music, ArmorEvo, City, MaybeArmorEvo, MaybeCity, MaybeMusic, Music};
 use byteorder::{ByteOrder, LittleEndian};
 use dcb_bytes::Bytes;
+use ref_cast::RefCast;
 use zutil::{
 	null_ascii_string::{self, NullAsciiString},
 	AsciiStrArr,
 };
-use ref_cast::RefCast;
 
 /// Card id type
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]