From c23449fac320c6ccf3b4d3b44615ab62c12a7645 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 09:44:14 +1300
Subject: [PATCH] just reorged some code

---
 84_Super_Star_Trek/rust/src/model.rs | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index fa0ca4c2..d1c937ab 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -7,6 +7,21 @@ pub struct Galaxy {
     pub enterprise: Enterprise
 }
 
+pub struct Quadrant {
+    pub stars: Vec<Pos>,
+    pub star_base: Option<Pos>,
+    pub klingons: Vec<Klingon>
+}
+
+pub struct Klingon {
+    pub sector: Pos
+}
+
+pub struct Enterprise {
+    pub quadrant: Pos,
+    pub sector: Pos,
+}
+
 #[derive(PartialEq, Clone, Copy, Debug)]
 pub struct Pos(pub u8, pub u8);
 
@@ -54,21 +69,6 @@ pub enum SectorStatus {
     Empty, Star, StarBase, Klingon
 }
 
-pub struct Quadrant {
-    pub stars: Vec<Pos>,
-    pub star_base: Option<Pos>,
-    pub klingons: Vec<Klingon>
-}
-
-pub struct Klingon {
-    pub sector: Pos
-}
-
-pub struct Enterprise {
-    pub quadrant: Pos,
-    pub sector: Pos,
-}
-
 impl Galaxy {
     pub fn generate_new() -> Self {
         let quadrants = Self::generate_quadrants();