Move types to where they belong

rincewound · Dec 8, 2024 · eafcb3b · eafcb3b
1 parent 1fc75ec
commit eafcb3b
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 71 deletions.
diff --git a/src/analyzer_mode.rs b/src/analyzer_mode.rs
@@ -1,4 +1,4 @@
-use std::sync::mpsc::Receiver;
+use std::{fmt::Display, sync::mpsc::Receiver};
 
 use crossterm::event::KeyCode;
 use ratatui::{
@@ -13,9 +13,24 @@ use crate::{
     mode::ApplicationMode,
     portthread::{RxTx, SerialStateMessage},
     serialtypes::control_char_to_string,
-    DisplayMode, Endianness,
+    DisplayMode,
 };
 
+#[derive(Debug, Default, PartialEq)]
+pub enum Endianness {
+    Big,
+    #[default]
+    Little,
+}
+impl Display for Endianness {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Endianness::Big => write!(f, "Big"),
+            Endianness::Little => write!(f, "Little"),
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct AnalyzerMode {
     active: bool,

diff --git a/src/interactive_mode.rs b/src/interactive_mode.rs
@@ -1,4 +1,4 @@
-use std::sync::mpsc::Sender;
+use std::{fmt::Display, sync::mpsc::Sender};
 
 use crossterm::event::KeyCode;
 use ratatui::{
@@ -8,10 +8,50 @@ use ratatui::{
     widgets::{Block, Paragraph},
 };
 
-use crate::{
-    mode::ApplicationMode, portthread::SerialCommand, CRLFSetting, InputMode, CRLF_SETTINGS,
-    INPUT_MODES,
-};
+use crate::{mode::ApplicationMode, portthread::SerialCommand};
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum InputMode {
+    Default,
+    Hex,
+}
+
+const INPUT_MODES: [InputMode; 2] = [InputMode::Default, InputMode::Hex];
+
+#[derive(Debug, PartialEq, Clone, Copy)]
+pub enum CRLFSetting {
+    None,
+    CR,
+    LF,
+    CRLF,
+}
+
+const CRLF_SETTINGS: [CRLFSetting; 4] = [
+    CRLFSetting::None,
+    CRLFSetting::CR,
+    CRLFSetting::LF,
+    CRLFSetting::CRLF,
+];
+
+impl Display for CRLFSetting {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            CRLFSetting::None => write!(f, "None"),
+            CRLFSetting::CR => write!(f, "CR"),
+            CRLFSetting::LF => write!(f, "LF"),
+            CRLFSetting::CRLF => write!(f, "CRLF"),
+        }
+    }
+}
+
+impl Display for InputMode {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            InputMode::Default => write!(f, "Default"),
+            InputMode::Hex => write!(f, "Hex"),
+        }
+    }
+}
 
 #[derive(Debug)]
 pub struct InteractiveMode {

diff --git a/src/main.rs b/src/main.rs
@@ -31,22 +31,6 @@ const DISPLAY_MODES: [DisplayMode; 5] = [
     DisplayMode::MixedDec,
 ];
 
-const CRLF_SETTINGS: [CRLFSetting; 4] = [
-    CRLFSetting::None,
-    CRLFSetting::CR,
-    CRLFSetting::LF,
-    CRLFSetting::CRLF,
-];
-
-const INPUT_MODES: [InputMode; 2] = [InputMode::Default, InputMode::Hex];
-
-#[derive(Debug, Default, PartialEq)]
-pub enum Endianness {
-    Big,
-    #[default]
-    Little,
-}
-
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum DisplayMode {
     Decimal,
@@ -56,49 +40,6 @@ pub enum DisplayMode {
     MixedDec,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum InputMode {
-    Default,
-    Hex,
-}
-
-#[derive(Debug, PartialEq, Clone, Copy)]
-pub enum CRLFSetting {
-    None,
-    CR,
-    LF,
-    CRLF,
-}
-
-impl Display for Endianness {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Endianness::Big => write!(f, "Big"),
-            Endianness::Little => write!(f, "Little"),
-        }
-    }
-}
-
-impl Display for CRLFSetting {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            CRLFSetting::None => write!(f, "None"),
-            CRLFSetting::CR => write!(f, "CR"),
-            CRLFSetting::LF => write!(f, "LF"),
-            CRLFSetting::CRLF => write!(f, "CRLF"),
-        }
-    }
-}
-
-impl Display for InputMode {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            InputMode::Default => write!(f, "Default"),
-            InputMode::Hex => write!(f, "Hex"),
-        }
-    }
-}
-
 impl Display for DisplayMode {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {

diff --git a/src/settings_mode.rs b/src/settings_mode.rs
@@ -12,7 +12,7 @@ use crate::{
     mode::ApplicationMode,
     portthread::SerialContext,
     serialtypes::{BAUD_RATES, DATABITS, PARITY, STOP_BITS},
-    CRLFSetting, DisplayMode, DISPLAY_MODES,
+    DisplayMode, DISPLAY_MODES,
 };
 
 #[derive(Debug)]
@@ -22,7 +22,6 @@ pub struct SettingsMode {
     stopbits: u8,
     parity: String,
     databits: u8,
-    crlf: CRLFSetting,
     display_mode: DisplayMode,
     active: bool,
 }
@@ -70,8 +69,6 @@ impl ApplicationMode for SettingsMode {
             "Display".fg(ratatui::style::Color::Gray),
             "M".fg(highlight_color),
             format!("ode:{} ", self.display_mode).fg(ratatui::style::Color::Gray),
-            "C".fg(highlight_color),
-            format!("RLF:{} ", self.crlf).fg(ratatui::style::Color::Gray),
         ]));
 
         buf.render_widget(opts.block(block), area);
@@ -90,7 +87,6 @@ impl SettingsMode {
             stopbits: STOP_BITS[0],
             parity: PARITY[0].to_string(),
             databits: DATABITS[3],
-            crlf: CRLFSetting::None,
             display_mode: DisplayMode::Hex,
             active: false,
         };