refactor: restructure canvas file folder structure (#1368)

* refactor: group together some canvas files

* rename file

* more shuffling around

* fmt

* more shuffling

Going to flatten widgets in another PR.

* some docs

* naming

* fmt

3 files changed, 24 insertions, 16 deletions

diff --git a/src/app/data_farmer.rs b/src/app/data_farmer.rs
index 4a2e09fe..720092db 100644
--- a/src/app/data_farmer.rs
+++ b/src/app/data_farmer.rs
@@ -13,7 +13,6 @@
 //! memory usage and higher CPU usage - you will be trying to process more and
 //! more points as this is used!
 
-use crate::data_collection::processes::ProcessHarvest;
 use std::{collections::BTreeMap, time::Instant, vec::Vec};
 
 use hashbrown::HashMap;
@@ -21,9 +20,8 @@ use hashbrown::HashMap;
 #[cfg(feature = "battery")]
 use crate::data_collection::batteries;
 use crate::{
-    data_collection::{cpu, disks, memory, network, temperature, Data},
-    utils::data_prefixes::*,
-    utils::gen_util::get_decimal_bytes,
+    data_collection::{cpu, disks, memory, network, processes::ProcessHarvest, temperature, Data},
+    utils::{data_prefixes::*, gen_util::get_decimal_bytes},
     Pid,
 };
 
@@ -370,9 +368,10 @@ impl DataCollection {
                 let io_device = {
                     #[cfg(target_os = "macos")]
                     {
-                        use regex::Regex;
                         use std::sync::OnceLock;
 
+                        use regex::Regex;
+
                         // Must trim one level further for macOS!
                         static DISK_REGEX: OnceLock<Regex> = OnceLock::new();
                         if let Some(new_name) = DISK_REGEX
diff --git a/src/app/layout_manager.rs b/src/app/layout_manager.rs
index f5ed8eaa..ca353f52 100644
--- a/src/app/layout_manager.rs
+++ b/src/app/layout_manager.rs
@@ -1,7 +1,9 @@
 use std::collections::BTreeMap;
 
-use crate::constants::DEFAULT_WIDGET_ID;
-use crate::error::{BottomError, Result};
+use crate::{
+    constants::DEFAULT_WIDGET_ID,
+    error::{BottomError, Result},
+};
 
 /// Represents a more usable representation of the layout, derived from the
 /// config.
diff --git a/src/app/query.rs b/src/app/query.rs
index 6f1a2858..5737cbc7 100644
--- a/src/app/query.rs
+++ b/src/app/query.rs
@@ -1,16 +1,23 @@
-use std::fmt::{Debug, Formatter};
-use std::time::Duration;
-use std::{borrow::Cow, collections::VecDeque};
+use std::{
+    borrow::Cow,
+    collections::VecDeque,
+    fmt::{Debug, Formatter},
+    time::Duration,
+};
 
 use humantime::parse_duration;
 use regex::Regex;
 
-use crate::data_collection::processes::ProcessHarvest;
-use crate::multi_eq_ignore_ascii_case;
-use crate::utils::data_prefixes::*;
-use crate::utils::error::{
-    BottomError::{self, QueryError},
-    Result,
+use crate::{
+    data_collection::processes::ProcessHarvest,
+    multi_eq_ignore_ascii_case,
+    utils::{
+        data_prefixes::*,
+        error::{
+            BottomError::{self, QueryError},
+            Result,
+        },
+    },
 };
 
 const DELIMITER_LIST: [char; 6] = ['=', '>', '<', '(', ')', '\"'];