From ab40fcff7e8e8550d29cf3616f967a58a1eff63a Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Thu, 5 Jun 2025 15:32:45 +0200 Subject: [PATCH] uptime: use "0 users" instead of "0 user" --- src/uucore/src/lib/features/uptime.rs | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/uucore/src/lib/features/uptime.rs b/src/uucore/src/lib/features/uptime.rs index 91fa9dd7d..795632c41 100644 --- a/src/uucore/src/lib/features/uptime.rs +++ b/src/uucore/src/lib/features/uptime.rs @@ -302,13 +302,13 @@ pub fn get_nusers() -> usize { /// /// # Returns /// -/// e.g. "0 user", "1 user", "2 users" +/// e.g. "0 users", "1 user", "2 users" #[inline] -pub fn format_nusers(nusers: usize) -> String { - match nusers { - 0 => "0 user".to_string(), - 1 => "1 user".to_string(), - _ => format!("{nusers} users"), +pub fn format_nusers(n: usize) -> String { + if n == 1 { + String::from("1 user") + } else { + format!("{n} users") } } @@ -373,3 +373,15 @@ pub fn get_formatted_loadavg() -> UResult { loadavg.0, loadavg.1, loadavg.2 )) } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_format_nusers() { + assert_eq!("0 users", format_nusers(0)); + assert_eq!("1 user", format_nusers(1)); + assert_eq!("2 users", format_nusers(2)); + } +}