From d6b6e0aea927501e0756224b98b122164e2008a0 Mon Sep 17 00:00:00 2001
From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com>
Date: Sat, 17 Jun 2023 06:08:11 +0000
Subject: refactor: move out bits/bytes enum to utils (#1211)

---
 src/app.rs                          | 6 ++++--
 src/canvas/widgets/network_graph.rs | 3 +--
 src/data_conversion.rs              | 2 +-
 src/lib.rs                          | 2 +-
 src/options.rs                      | 6 ++++--
 src/units.rs                        | 4 ----
 src/units/data_units.rs             | 6 ------
 src/utils/data_units.rs             | 6 ++++++
 8 files changed, 17 insertions(+), 18 deletions(-)
 delete mode 100644 src/units.rs
 delete mode 100644 src/units/data_units.rs
 create mode 100644 src/utils/data_units.rs

diff --git a/src/app.rs b/src/app.rs
index a65d0e20..50e87b22 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -12,14 +12,16 @@ use layout_manager::*;
 pub use states::*;
 use unicode_segmentation::{GraphemeCursor, UnicodeSegmentation};
 
-use crate::widgets::{ProcWidgetColumn, ProcWidgetMode};
 use crate::{
     constants,
     data_conversion::ConvertedData,
-    units::data_units::DataUnit,
     utils::error::{BottomError, Result},
     Pid,
 };
+use crate::{
+    utils::data_units::DataUnit,
+    widgets::{ProcWidgetColumn, ProcWidgetMode},
+};
 
 pub mod data_farmer;
 pub mod data_harvester;
diff --git a/src/canvas/widgets/network_graph.rs b/src/canvas/widgets/network_graph.rs
index 12280076..bfbe3582 100644
--- a/src/canvas/widgets/network_graph.rs
+++ b/src/canvas/widgets/network_graph.rs
@@ -14,8 +14,7 @@ use crate::{
         time_graph::{GraphData, TimeGraph},
         tui_widget::time_chart::Point,
     },
-    units::data_units::DataUnit,
-    utils::gen_util::*,
+    utils::{data_units::DataUnit, gen_util::*},
 };
 
 impl Painter {
diff --git a/src/data_conversion.rs b/src/data_conversion.rs
index 19fd3809..59ffcdce 100644
--- a/src/data_conversion.rs
+++ b/src/data_conversion.rs
@@ -10,7 +10,7 @@ use crate::app::{
     AxisScaling,
 };
 use crate::components::tui_widget::time_chart::Point;
-use crate::units::data_units::DataUnit;
+use crate::utils::data_units::DataUnit;
 use crate::utils::gen_util::*;
 use crate::widgets::{DiskWidgetData, TempWidgetData};
 
diff --git a/src/lib.rs b/src/lib.rs
index d3bce2b1..1655e08d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -47,6 +47,7 @@ use utils::error;
 
 pub mod app;
 pub mod utils {
+    pub mod data_units;
     pub mod error;
     pub mod gen_util;
     pub mod logging;
@@ -57,7 +58,6 @@ pub mod components;
 pub mod constants;
 pub mod data_conversion;
 pub mod options;
-pub mod units;
 pub mod widgets;
 
 pub use utils::logging::*;
diff --git a/src/options.rs b/src/options.rs
index cfe4550d..d063d463 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -19,8 +19,10 @@ use crate::{
     app::{filter::Filter, layout_manager::*, *},
     canvas::{canvas_styling::CanvasStyling, ColourScheme},
     constants::*,
-    units::data_units::DataUnit,
-    utils::error::{self, BottomError},
+    utils::{
+        data_units::DataUnit,
+        error::{self, BottomError},
+    },
     widgets::*,
 };
 
diff --git a/src/units.rs b/src/units.rs
deleted file mode 100644
index aa458fb8..00000000
--- a/src/units.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod data_units;
-
-// FIXME: Maybe move temperature units here? idk.
-// FIXME: Maybe combine this with utils?
diff --git a/src/units/data_units.rs b/src/units/data_units.rs
deleted file mode 100644
index df404732..00000000
--- a/src/units/data_units.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#[derive(Debug, Clone, Eq, PartialEq, Default)]
-pub enum DataUnit {
-    Byte,
-    #[default]
-    Bit,
-}
diff --git a/src/utils/data_units.rs b/src/utils/data_units.rs
new file mode 100644
index 00000000..df404732
--- /dev/null
+++ b/src/utils/data_units.rs
@@ -0,0 +1,6 @@
+#[derive(Debug, Clone, Eq, PartialEq, Default)]
+pub enum DataUnit {
+    Byte,
+    #[default]
+    Bit,
+}
-- 
cgit v1.2.3