From a8ed83872657ab29fd39e26731db4b569db10624 Mon Sep 17 00:00:00 2001 From: ClementTsang Date: Mon, 11 May 2020 22:52:35 -0400 Subject: [PATCH] refactor: use a nicer match statement in one spot --- src/data_conversion.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/data_conversion.rs b/src/data_conversion.rs index 732d29bf..f47170db 100644 --- a/src/data_conversion.rs +++ b/src/data_conversion.rs @@ -228,11 +228,11 @@ pub fn convert_mem_labels(current_data: &data_farmer::DataCollection) -> (String let mem_label = "RAM:".to_string() + &format!( "{:3.0}%", - if current_data.memory_harvest.mem_total_in_mb == 0 { - 0.0 - } else { - current_data.memory_harvest.mem_used_in_mb as f64 * 100.0 - / current_data.memory_harvest.mem_total_in_mb as f64 + match current_data.memory_harvest.mem_total_in_mb { + 0 => 0.0, + _ => + current_data.memory_harvest.mem_used_in_mb as f64 * 100.0 + / current_data.memory_harvest.mem_total_in_mb as f64, } ) + &format!( @@ -244,11 +244,11 @@ pub fn convert_mem_labels(current_data: &data_farmer::DataCollection) -> (String let swap_label = "SWP:".to_string() + &format!( "{:3.0}%", - if current_data.swap_harvest.mem_total_in_mb == 0 { - 0.0 - } else { - current_data.swap_harvest.mem_used_in_mb as f64 * 100.0 - / current_data.swap_harvest.mem_total_in_mb as f64 + match current_data.swap_harvest.mem_total_in_mb { + 0 => 0.0, + _ => + current_data.swap_harvest.mem_used_in_mb as f64 * 100.0 + / current_data.swap_harvest.mem_total_in_mb as f64, } ) + &format!(