Skip to content

Commit ab40fcf

Browse files
committed
uptime: use "0 users" instead of "0 user"
1 parent 61bd11a commit ab40fcf

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

src/uucore/src/lib/features/uptime.rs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -302,13 +302,13 @@ pub fn get_nusers() -> usize {
302302
///
303303
/// # Returns
304304
///
305-
/// e.g. "0 user", "1 user", "2 users"
305+
/// e.g. "0 users", "1 user", "2 users"
306306
#[inline]
307-
pub fn format_nusers(nusers: usize) -> String {
308-
match nusers {
309-
0 => "0 user".to_string(),
310-
1 => "1 user".to_string(),
311-
_ => format!("{nusers} users"),
307+
pub fn format_nusers(n: usize) -> String {
308+
if n == 1 {
309+
String::from("1 user")
310+
} else {
311+
format!("{n} users")
312312
}
313313
}
314314

@@ -373,3 +373,15 @@ pub fn get_formatted_loadavg() -> UResult<String> {
373373
loadavg.0, loadavg.1, loadavg.2
374374
))
375375
}
376+
377+
#[cfg(test)]
378+
mod tests {
379+
use super::*;
380+
381+
#[test]
382+
fn test_format_nusers() {
383+
assert_eq!("0 users", format_nusers(0));
384+
assert_eq!("1 user", format_nusers(1));
385+
assert_eq!("2 users", format_nusers(2));
386+
}
387+
}

0 commit comments

Comments
 (0)