From 0359a01cc89b1bbcf0bd08799d2c8dfd09f609d0 Mon Sep 17 00:00:00 2001 From: mustafa salih Date: Wed, 3 Feb 2021 03:42:05 +0300 Subject: removed some doublicated code --- src/utils/load_average.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/utils/load_average.rs') diff --git a/src/utils/load_average.rs b/src/utils/load_average.rs index 4fd38f7..70e4a72 100644 --- a/src/utils/load_average.rs +++ b/src/utils/load_average.rs @@ -1,16 +1,18 @@ use crate::config::CONFIG; +use crate::types::ThreadsData; use std::fs::File; use std::io::Read; -pub fn get_load_avg() -> String { +pub fn get_load_avg() -> ThreadsData { let mut buf = String::new(); match File::open("/proc/loadavg") { Ok(mut file) => match file.read_to_string(&mut buf) { Ok(data) => data, - _ => return String::from(""), + _ => return ThreadsData::LoadAvg(String::from("")), }, - _ => return String::from("Error"), + _ => return ThreadsData::LoadAvg(String::from("Error")), }; let buf = buf.split_whitespace().collect::>()[0]; - format!(" {} {} {}", CONFIG.loadavg.icon, buf, CONFIG.seperator) + let data = format!(" {} {} {}", CONFIG.loadavg.icon, buf, CONFIG.seperator); + ThreadsData::LoadAvg(data) } -- cgit v1.2.3