refactor: remove some redundant error types (#4)

This commit is contained in:
Sora 2024-08-13 22:59:11 +02:00 committed by GitHub
commit ae76a0cbe1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 35 additions and 39 deletions

View file

@ -17,15 +17,15 @@ fn main() -> Result<(), Report> {
color_eyre::install()?;
let fields = Fields {
user_info: get_username_and_hostname()?,
user_info: get_username_and_hostname(),
os_name: get_os_pretty_name()?,
kernel_version: get_system_info()?,
shell: get_shell()?,
shell: get_shell(),
uptime: get_current()?,
window_manager: get_desktop_info()?,
window_manager: get_desktop_info(),
memory_usage: get_memory_usage(sysinfo()?),
storage: get_root_disk_usage()?,
colors: print_dots()?,
colors: print_dots(),
};
print_system_info(&fields);
@ -50,6 +50,18 @@ struct Fields {
}
fn print_system_info(fields: &Fields) {
let Fields {
user_info,
os_name,
kernel_version,
shell,
uptime,
window_manager,
memory_usage,
storage,
colors,
} = fields;
println!(
"
{CYAN} {BLUE} {user_info} ~{RESET}
@ -60,16 +72,5 @@ fn print_system_info(fields: &Fields) {
{BLUE} {CYAN} {CYAN} {CYAN} {BLUE}WM{RESET} {window_manager}
{BLUE} {CYAN}{BLUE} {CYAN}󰍛 {BLUE}Memory{RESET} {memory_usage}
{BLUE} {CYAN}{BLUE} {CYAN}󱥎 {BLUE}Storage (/){RESET} {storage}
{CYAN} {BLUE} {CYAN} {BLUE}Colors{RESET} {colors}
",
user_info = fields.user_info,
os_name = fields.os_name,
kernel_version = fields.kernel_version,
shell = fields.shell,
uptime = fields.uptime,
window_manager = fields.window_manager,
memory_usage = fields.memory_usage,
storage = fields.storage,
colors = fields.colors,
);
{CYAN} {BLUE} {CYAN} {BLUE}Colors{RESET} {colors}");
}