uptime: Change get_uptime return to Duration

Author: irbeam256

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

@@ -15,6 +15,7 @@
 use crate::error::{UError, UResult};
 use chrono::Local;
 use libc::time_t;
+use std::time::Duration;
 use thiserror::Error;
 
 #[derive(Debug, Error)]
@@ -51,8 +52,8 @@ pub fn get_formatted_time() -> String {
 /// Returns a UResult with the uptime in seconds if successful, otherwise an UptimeError.
 #[cfg(target_os = "openbsd")]
 pub fn get_uptime(_boot_time: Option<time_t>) -> UResult<i64> {
-    use libc::CLOCK_BOOTTIME;
     use libc::clock_gettime;
+    use libc::CLOCK_BOOTTIME;
 
     use libc::c_int;
     use libc::timespec;
@@ -86,10 +87,10 @@ pub fn get_uptime(_boot_time: Option<time_t>) -> UResult<i64> {
 ///
 /// # Returns
 ///
-/// Returns a UResult with the uptime in seconds if successful, otherwise an UptimeError.
+/// Returns a UResult with the uptime as a Duration if successful, otherwise an UptimeError.
 #[cfg(unix)]
 #[cfg(not(target_os = "openbsd"))]
-pub fn get_uptime(boot_time: Option<time_t>) -> UResult<i64> {
+pub fn get_uptime(boot_time: Option<time_t>) -> UResult<Duration> {
     use crate::utmpx::Utmpx;
     use libc::BOOT_TIME;
     use std::fs::File;
@@ -101,7 +102,8 @@ pub fn get_uptime(boot_time: Option<time_t>) -> UResult<i64> {
         .ok()
         .and_then(|mut f| f.read_to_string(&mut proc_uptime_s).ok())
         .and_then(|_| proc_uptime_s.split_whitespace().next())
-        .and_then(|s| s.split('.').next().unwrap_or("0").parse::<i64>().ok());
+        .and_then(|s| s.parse::<f64>().ok())
+        .and_then(|f| Duration::try_from_secs_f64(f).ok());
 
     if let Some(uptime) = proc_uptime {
         return Ok(uptime);
@@ -132,7 +134,7 @@ pub fn get_uptime(boot_time: Option<time_t>) -> UResult<i64> {
         if now < boottime {
             Err(UptimeError::BootTime)?;
         }
-        return Ok(now - boottime);
+        return Ok(Duration::from_secs(u64::try_from(now - boottime).unwrap()));
     }
 
     Err(UptimeError::SystemUptime)?
@@ -209,7 +211,7 @@ pub fn get_nusers() -> usize {
 /// Returns the number of users currently logged in if successful, otherwise 0
 #[cfg(target_os = "openbsd")]
 pub fn get_nusers(file: &str) -> usize {
-    use utmp_classic::{UtmpEntry, parse_from_path};
+    use utmp_classic::{parse_from_path, UtmpEntry};
 
     let mut nusers = 0;