diff --git a/src/main.rs b/src/main.rs index 950a766..516982e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -9,6 +9,7 @@ use crate::desktop::get_desktop_info; use crate::release::{get_os_pretty_name, get_system_info}; use crate::system::{get_memory_usage, get_root_disk_usage, get_shell, get_username_and_hostname}; use crate::uptime::get_current; +use std::io; use color_eyre::Report; use nix::sys::sysinfo::sysinfo; @@ -16,14 +17,15 @@ use nix::sys::sysinfo::sysinfo; fn main() -> Result<(), Report> { color_eyre::install()?; + let info = sysinfo().map_err(|e| io::Error::new(io::ErrorKind::Other, e))?; let fields = Fields { user_info: get_username_and_hostname(), os_name: get_os_pretty_name()?, kernel_version: get_system_info()?, shell: get_shell(), - uptime: get_current()?, + uptime: get_current(&info)?, desktop: get_desktop_info(), - memory_usage: get_memory_usage(sysinfo()?), + memory_usage: get_memory_usage(&info), storage: get_root_disk_usage()?, colors: print_dots(), }; diff --git a/src/system.rs b/src/system.rs index ab10cd5..5fa8587 100644 --- a/src/system.rs +++ b/src/system.rs @@ -40,9 +40,9 @@ pub fn get_root_disk_usage() -> Result { )) } -pub fn get_memory_usage(info: SysInfo) -> String { +pub fn get_memory_usage(info: &SysInfo) -> String { #[inline(always)] - fn parse_memory_info(info: SysInfo) -> (f64, f64) { + fn parse_memory_info(info: &SysInfo) -> (f64, f64) { let total_memory_kb = (info.ram_total() / 1024) as f64; let available_memory_kb = (info.ram_unused() / 1024) as f64; diff --git a/src/uptime.rs b/src/uptime.rs index 6c44640..4090acd 100644 --- a/src/uptime.rs +++ b/src/uptime.rs @@ -1,9 +1,8 @@ use color_eyre::Result; -use nix::sys::sysinfo::sysinfo; +use nix::sys::sysinfo::SysInfo; use std::io; -pub fn get_current() -> Result { - let info = sysinfo().map_err(|e| io::Error::new(io::ErrorKind::Other, e))?; +pub fn get_current(info: &SysInfo) -> Result { let uptime_seconds = info.uptime().as_secs_f64(); let total_minutes = (uptime_seconds / 60.0).round() as u64;