From 4afd71926f18ab4d46c916129217ed261a95d760 Mon Sep 17 00:00:00 2001 From: Twan Stok Date: Mon, 13 Mar 2023 03:37:30 +0100 Subject: [PATCH] rustfmt --- src/app/data_farmer.rs | 9 +++++++-- src/app/data_harvester/memory.rs | 2 +- src/data_conversion.rs | 6 +++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/app/data_farmer.rs b/src/app/data_farmer.rs index d51b3eff..93f400bf 100644 --- a/src/app/data_farmer.rs +++ b/src/app/data_farmer.rs @@ -212,7 +212,11 @@ impl DataCollection { } // Memory and Swap - if let (Some(memory), Some(cache), Some(swap)) = (harvested_data.memory, harvested_data.cache, harvested_data.swap) { + if let (Some(memory), Some(cache), Some(swap)) = ( + harvested_data.memory, + harvested_data.cache, + harvested_data.swap, + ) { self.eat_memory_and_swap(memory, cache, swap, &mut new_entry); } @@ -267,7 +271,8 @@ impl DataCollection { } fn eat_memory_and_swap( - &mut self, memory: memory::MemHarvest, cache: memory::MemHarvest, swap: memory::MemHarvest, new_entry: &mut TimedData, + &mut self, memory: memory::MemHarvest, cache: memory::MemHarvest, swap: memory::MemHarvest, + new_entry: &mut TimedData, ) { // Memory new_entry.mem_data = memory.use_percent; diff --git a/src/app/data_harvester/memory.rs b/src/app/data_harvester/memory.rs index 27731861..38882e0c 100644 --- a/src/app/data_harvester/memory.rs +++ b/src/app/data_harvester/memory.rs @@ -1,8 +1,8 @@ //! Memory data collection. pub mod sysinfo; -pub(crate) use self::sysinfo::get_ram_usage; pub(crate) use self::sysinfo::get_cache_usage; +pub(crate) use self::sysinfo::get_ram_usage; cfg_if::cfg_if! { if #[cfg(target_os = "windows")] { diff --git a/src/data_conversion.rs b/src/data_conversion.rs index 6615ab5b..e26e2edc 100644 --- a/src/data_conversion.rs +++ b/src/data_conversion.rs @@ -258,7 +258,11 @@ pub fn convert_swap_data_points(current_data: &DataCollection) -> Vec { pub fn convert_mem_labels( current_data: &DataCollection, -) -> (Option<(String, String)>, Option<(String, String)>, Option<(String, String)>) { +) -> ( + Option<(String, String)>, + Option<(String, String)>, + Option<(String, String)>, +) { /// Returns the unit type and denominator for given total amount of memory in kibibytes. fn return_unit_and_denominator_for_mem_kib(mem_total_kib: u64) -> (&'static str, f64) { if mem_total_kib < 1024 {