refactor: move out bits/bytes enum to utils (#1211)

ClementTsang · Jun 17, 2023 · d6b6e0a · d6b6e0a
1 parent 8d078f8
commit d6b6e0a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/src/units/data_units.rs → src/utils/data_units.rs b/src/units/data_units.rs → src/utils/data_units.rs