Fix formatting using cargo fmt

ClementTsang · Jan 17, 2021 · f757c8c · f757c8c
1 parent ad164df
commit f757c8c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/src/app/data_farmer.rs b/src/app/data_farmer.rs
@@ -16,12 +16,12 @@ use once_cell::sync::Lazy;
 
 use std::{time::Instant, vec::Vec};
 
+use crate::app::data_harvester::loadavg::LoadAvgHarvest;
 use crate::{
-    data_harvester::{batteries, cpu, loadavg, disks, mem, network, processes, temperature, Data},
+    data_harvester::{batteries, cpu, disks, loadavg, mem, network, processes, temperature, Data},
     utils::gen_util::get_simple_byte_values,
 };
 use regex::Regex;
-use crate::app::data_harvester::loadavg::LoadAvgHarvest;
 
 pub type TimeOffset = f64;
 pub type Value = f64;
@@ -31,7 +31,7 @@ pub struct TimedData {
     pub rx_data: Value,
     pub tx_data: Value,
     pub cpu_data: Vec<Value>,
-    pub loadavg_data: [f64;3],
+    pub loadavg_data: [f64; 3],
     pub mem_data: Option<Value>,
     pub swap_data: Option<Value>,
 }

diff --git a/src/app/data_harvester.rs b/src/app/data_harvester.rs
@@ -18,8 +18,8 @@ use super::DataFilters;
 
 pub mod batteries;
 pub mod cpu;
-pub mod loadavg;
 pub mod disks;
+pub mod loadavg;
 pub mod mem;
 pub mod network;
 pub mod processes;
@@ -255,9 +255,7 @@ impl DataCollector {
         }
 
         // Load Average
-        if let Ok(loadavg_data) = loadavg::get_loadavg()
-            .await
-        {
+        if let Ok(loadavg_data) = loadavg::get_loadavg().await {
             self.data.loadavg = Some(loadavg_data);
         }
 

diff --git a/src/app/data_harvester/loadavg.rs b/src/app/data_harvester/loadavg.rs
@@ -1,8 +1,8 @@
 use sysinfo::{System, SystemExt};
 
-pub type LoadAvgHarvest = [f64;3];
+pub type LoadAvgHarvest = [f64; 3];
 
-pub async fn get_loadavg() -> crate::error::Result<LoadAvgHarvest>{
+pub async fn get_loadavg() -> crate::error::Result<LoadAvgHarvest> {
     let s = System::new_all();
     let load_avg = s.get_load_average();
     Ok([load_avg.one, load_avg.five, load_avg.fifteen])

diff --git a/src/canvas/widgets/cpu_graph.rs b/src/canvas/widgets/cpu_graph.rs
@@ -250,7 +250,8 @@ impl CpuGraphWidget for Painter {
 
             let loadavg = app_state.canvas_data.loadavg_data;
             let loadavg_str = format!("{} {} {} ", loadavg[0], loadavg[1], loadavg[2]);
-            let loadavg_str_size = UnicodeSegmentation::graphemes(loadavg_str.as_str(), true).count();
+            let loadavg_str_size =
+                UnicodeSegmentation::graphemes(loadavg_str.as_str(), true).count();
             let title = if app_state.is_expanded {
                 const TITLE_BASE: &str = " CPU ── Esc to go back ";
 
@@ -261,7 +262,9 @@ impl CpuGraphWidget for Painter {
                         format!(
                             "─{}─ Esc to go back ",
                             "─".repeat(usize::from(draw_loc.width).saturating_sub(
-                                loadavg_str_size + UnicodeSegmentation::graphemes(TITLE_BASE, true).count() + 2
+                                loadavg_str_size
+                                    + UnicodeSegmentation::graphemes(TITLE_BASE, true).count()
+                                    + 2
                             ))
                         ),
                         border_style,
@@ -270,7 +273,7 @@ impl CpuGraphWidget for Painter {
             } else {
                 Spans::from(vec![
                     Span::styled(" CPU ", self.colours.widget_title_style),
-                    Span::styled(loadavg_str, self.colours.widget_title_style)
+                    Span::styled(loadavg_str, self.colours.widget_title_style),
                 ])
             };