diff --git a/crates/cpu/src/config.rs b/crates/cpu/src/config.rs
index 5be163c..4e66010 100644
--- a/crates/cpu/src/config.rs
+++ b/crates/cpu/src/config.rs
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // See Notices.txt for copyright information
 use crate::{
-    instruction::{MOpTrait, PRegNum, RenamedMOp, UnitNum, UnitOutRegNum, CONST_ZERO_UNIT_NUM},
+    instruction::{CONST_ZERO_UNIT_NUM, MOpTrait, PRegNum, RenamedMOp, UnitNum, UnitOutRegNum},
     unit::{
-        unit_base::{UnitForwardingInfo, UnitToRegAlloc},
         UnitCancelInput, UnitKind, UnitOutputWrite,
+        unit_base::{UnitForwardingInfo, UnitToRegAlloc},
     },
 };
 use fayalite::prelude::*;
diff --git a/crates/cpu/src/instruction.rs b/crates/cpu/src/instruction.rs
index 80dd9d5..dad8087 100644
--- a/crates/cpu/src/instruction.rs
+++ b/crates/cpu/src/instruction.rs
@@ -25,10 +25,7 @@ impl<T: MOpTrait> MOpInto<T> for T {
 }
 
 pub trait MOpTrait: Type {
-    type Mapped<NewDestReg: Type, NewSrcRegWidth: Size>: MOpTrait<
-        DestReg = NewDestReg,
-        SrcRegWidth = NewSrcRegWidth,
-    >;
+    type Mapped<NewDestReg: Type, NewSrcRegWidth: Size>: MOpTrait<DestReg = NewDestReg, SrcRegWidth = NewSrcRegWidth>;
     type DestReg: Type;
     type SrcRegWidth: Size;
     fn dest_reg_ty(self) -> Self::DestReg;
@@ -73,11 +70,11 @@ pub trait CommonMOpTrait: MOpTrait {
     type PrefixPad: KnownSize;
     type SrcCount: KnownSize;
     type CommonMOpTraitMapped<NewDestReg: Type, NewSrcRegWidth: Size>: CommonMOpTrait<
-        DestReg = NewDestReg,
-        SrcRegWidth = NewSrcRegWidth,
-        PrefixPad = Self::PrefixPad,
-        SrcCount = Self::SrcCount,
-    >;
+            DestReg = NewDestReg,
+            SrcRegWidth = NewSrcRegWidth,
+            PrefixPad = Self::PrefixPad,
+            SrcCount = Self::SrcCount,
+        >;
     type CommonMOpTraitDestReg: Type;
     type CommonMOpTraitSrcRegWidth: Size;
     fn common_mop_ty(
diff --git a/crates/cpu/src/reg_alloc.rs b/crates/cpu/src/reg_alloc.rs
index 6e7bc5d..6b3a6d5 100644
--- a/crates/cpu/src/reg_alloc.rs
+++ b/crates/cpu/src/reg_alloc.rs
@@ -3,18 +3,18 @@
 use crate::{
     config::CpuConfig,
     instruction::{
-        MOp, MOpDestReg, MOpRegNum, MOpTrait, MoveRegMOp, PRegNum, RenameTableName, UnitOutRegNum,
-        COMMON_MOP_SRC_LEN,
+        COMMON_MOP_SRC_LEN, MOp, MOpDestReg, MOpRegNum, MOpTrait, MoveRegMOp, PRegNum,
+        RenameTableName, UnitOutRegNum,
     },
     unit::{
-        unit_base::{UnitForwardingInfo, UnitInput},
         GlobalState, TrapData, UnitMOp, UnitOutput, UnitOutputWrite, UnitResult,
         UnitResultCompleted, UnitTrait,
+        unit_base::{UnitForwardingInfo, UnitInput},
     },
     util::tree_reduce::tree_reduce_with_state,
 };
 use fayalite::{
-    memory::{splat_mask, WriteStruct},
+    memory::{WriteStruct, splat_mask},
     module::{instance_with_loc, memory_with_loc, wire_with_loc},
     prelude::*,
     util::ready_valid::ReadyValid,
diff --git a/crates/cpu/src/unit.rs b/crates/cpu/src/unit.rs
index cc11c55..d6cd1d6 100644
--- a/crates/cpu/src/unit.rs
+++ b/crates/cpu/src/unit.rs
@@ -4,8 +4,8 @@
 use crate::{
     config::CpuConfig,
     instruction::{
-        mop_enum, AluBranchMOp, LoadStoreMOp, MOp, MOpDestReg, MOpInto, MOpRegNum, MOpTrait,
-        RenamedMOp, UnitOutRegNum,
+        AluBranchMOp, LoadStoreMOp, MOp, MOpDestReg, MOpInto, MOpRegNum, MOpTrait, RenamedMOp,
+        UnitOutRegNum, mop_enum,
     },
     register::{FlagsMode, PRegValue},
     unit::unit_base::UnitToRegAlloc,
diff --git a/crates/cpu/src/unit/alu_branch.rs b/crates/cpu/src/unit/alu_branch.rs
index 082fd8d..49908fc 100644
--- a/crates/cpu/src/unit/alu_branch.rs
+++ b/crates/cpu/src/unit/alu_branch.rs
@@ -4,14 +4,14 @@
 use crate::{
     config::CpuConfig,
     instruction::{
-        AddSubMOp, AluBranchMOp, AluCommonMOp, CommonMOp, LogicalMOp, MOpTrait, OutputIntegerMode,
-        RenamedMOp, UnitOutRegNum, COMMON_MOP_SRC_LEN,
+        AddSubMOp, AluBranchMOp, AluCommonMOp, COMMON_MOP_SRC_LEN, CommonMOp, LogicalMOp, MOpTrait,
+        OutputIntegerMode, RenamedMOp, UnitOutRegNum,
     },
     register::{FlagsMode, PRegFlagsPowerISA, PRegFlagsX86, PRegValue},
     unit::{
-        unit_base::{unit_base, ExecuteEnd, ExecuteStart, UnitToRegAlloc},
         DynUnit, DynUnitWrapper, GlobalState, UnitKind, UnitMOp, UnitOutput, UnitResult,
         UnitResultCompleted, UnitTrait,
+        unit_base::{ExecuteEnd, ExecuteStart, UnitToRegAlloc, unit_base},
     },
 };
 use fayalite::{
diff --git a/crates/cpu/src/unit/unit_base.rs b/crates/cpu/src/unit/unit_base.rs
index 9a3d0d8..0803933 100644
--- a/crates/cpu/src/unit/unit_base.rs
+++ b/crates/cpu/src/unit/unit_base.rs
@@ -3,7 +3,7 @@
 
 use crate::{
     config::CpuConfig,
-    instruction::{MOpTrait, PRegNum, UnitNum, UnitOutRegNum, COMMON_MOP_SRC_LEN},
+    instruction::{COMMON_MOP_SRC_LEN, MOpTrait, PRegNum, UnitNum, UnitOutRegNum},
     register::PRegValue,
     unit::{UnitCancelInput, UnitOutput, UnitOutputWrite},
     util::tree_reduce::tree_reduce,
diff --git a/crates/cpu/tests/reg_alloc.rs b/crates/cpu/tests/reg_alloc.rs
index beac954..f88d241 100644
--- a/crates/cpu/tests/reg_alloc.rs
+++ b/crates/cpu/tests/reg_alloc.rs
@@ -4,7 +4,7 @@
 use cpu::{
     config::{CpuConfig, UnitConfig},
     instruction::{AddSubMOp, LogicalMOp, MOp, MOpDestReg, MOpRegNum, OutputIntegerMode},
-    reg_alloc::{reg_alloc, FetchedDecodedMOp},
+    reg_alloc::{FetchedDecodedMOp, reg_alloc},
     register::{FlagsMode, PRegFlagsPowerISA},
     unit::{GlobalState, UnitKind},
 };
@@ -12,7 +12,7 @@ use fayalite::{
     assert_export_firrtl,
     firrtl::ExportOptions,
     prelude::*,
-    sim::{time::SimDuration, vcd::VcdWriterDecls, Simulation},
+    sim::{Simulation, time::SimDuration, vcd::VcdWriterDecls},
     util::RcWriter,
 };
 use std::num::NonZeroUsize;