diff --git a/src/main.rs b/src/main.rs index a749bf4..aace49d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -9,22 +9,19 @@ 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; 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(), desktop: get_desktop_info(), - uptime: get_current(&info)?, + uptime: get_current()?, memory_usage: get_memory_usage()?, storage: get_root_disk_usage()?, colors: print_dots(), diff --git a/src/uptime.rs b/src/uptime.rs index 4090acd..6c44640 100644 --- a/src/uptime.rs +++ b/src/uptime.rs @@ -1,8 +1,9 @@ use color_eyre::Result; -use nix::sys::sysinfo::SysInfo; +use nix::sys::sysinfo::sysinfo; use std::io; -pub fn get_current(info: &SysInfo) -> Result { +pub fn get_current() -> Result { + let info = sysinfo().map_err(|e| io::Error::new(io::ErrorKind::Other, e))?; let uptime_seconds = info.uptime().as_secs_f64(); let total_minutes = (uptime_seconds / 60.0).round() as u64;