From 5a484b0769e765ff0b1e3bbb4cdd7326dbd2d31a Mon Sep 17 00:00:00 2001 From: poz Date: Fri, 12 Dec 2025 22:58:10 +0100 Subject: [PATCH] more cold functions --- src/desktop.rs | 4 +--- src/lib.rs | 4 ++++ src/main.rs | 2 +- src/release.rs | 10 +++++----- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/desktop.rs b/src/desktop.rs index c3b179b..09caf3b 100644 --- a/src/desktop.rs +++ b/src/desktop.rs @@ -1,8 +1,6 @@ use std::ffi::CStr; -#[inline] -#[cold] -const fn unknown() -> &'static str { "Unknown" } +use crate::unknown; #[must_use] #[cfg_attr(feature = "hotpath", hotpath::measure)] diff --git a/src/lib.rs b/src/lib.rs index 9a177e5..71e4e3d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,6 +8,10 @@ pub mod uptime; use std::{io, mem::MaybeUninit}; +#[inline] +#[cold] +pub const fn unknown() -> &'static str { "Unknown" } + #[inline] #[cold] pub fn last_os_error() -> io::Result { diff --git a/src/main.rs b/src/main.rs index 0263c15..dd2e570 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,7 +8,7 @@ mod uptime; use std::io::{self, Cursor, Write}; -pub use microfetch_lib::{UtsName, last_os_error}; +pub use microfetch_lib::{UtsName, last_os_error, unknown}; use crate::{ desktop::get_desktop_info, diff --git a/src/release.rs b/src/release.rs index dac028e..5cf79ee 100644 --- a/src/release.rs +++ b/src/release.rs @@ -1,13 +1,13 @@ use std::io; -use crate::{UtsName, syscall::read_file_fast}; +use crate::{syscall::read_file_fast, unknown, UtsName}; #[must_use] #[cfg_attr(feature = "hotpath", hotpath::measure)] pub fn get_system_info(utsname: &UtsName) -> String { - let sysname = utsname.sysname().to_str().unwrap_or("Unknown"); - let release = utsname.release().to_str().unwrap_or("Unknown"); - let machine = utsname.machine().to_str().unwrap_or("Unknown"); + let sysname = utsname.sysname().to_str().unwrap_or_else(|_| unknown()); + let release = utsname.release().to_str().unwrap_or_else(|_| unknown()); + let machine = utsname.machine().to_str().unwrap_or_else(|_| unknown()); // Pre-allocate capacity: sysname + " " + release + " (" + machine + ")" let capacity = sysname.len() + 1 + release.len() + 2 + machine.len() + 1; @@ -71,5 +71,5 @@ pub fn get_os_pretty_name() -> Result { offset += line_end + 1; } - Ok("Unknown".to_owned()) + Ok(unknown().to_owned()) }