Replace as_nanos and use from_mins

Author: joriskleiber

src/pam/converse.rs

@@ -4,9 +4,7 @@ use std::time::Duration;
 
 use crate::cutils::string_from_ptr;
 use crate::pam::rpassword::Hidden;
-use crate::system::{
-    signal::{self, SignalSet},
-};
+use crate::system::signal::{self, SignalSet};
 
 use super::sys::*;
 

src/pam/mod.rs

@@ -7,9 +7,7 @@ use std::{
     time::Duration,
 };
 
-use crate::system::{
-    signal::{self, SignalSet},
-};
+use crate::system::signal::{self, SignalSet};
 
 use converse::ConverserData;
 use error::pam_err;

src/sudo/pam.rs

@@ -1,4 +1,5 @@
-use std::{ffi::OsString, time::Duration};
+use std::ffi::OsString;
+use std::time::Duration;
 
 use crate::common::context::LaunchType;
 use crate::common::error::Error;

src/sudoers/policy.rs

@@ -12,7 +12,8 @@ use crate::system::{Hostname, User};
 ///
 /// The trait definitions can be part of some global crate in the future, if we support more
 /// than just the sudoers file.
-use std::{collections::HashSet, time::Duration};
+use std::collections::HashSet;
+use std::time::Duration;
 
 #[must_use]
 #[cfg_attr(test, derive(Debug, PartialEq))]
@@ -191,7 +192,7 @@ mod test {
             Authentication {
                 must_authenticate: true,
                 allowed_attempts: 3,
-                prior_validity: Duration::from_secs(15 * 60),
+                prior_validity: Duration::from_mins(15),
                 credential: AuthenticatingUser::InvokingUser,
                 pwfeedback: false,
                 password_timeout: Some(Duration::from_secs(300)),
@@ -208,7 +209,7 @@ mod test {
             Authentication {
                 must_authenticate: false,
                 allowed_attempts: 3,
-                prior_validity: Duration::from_secs(15 * 60),
+                prior_validity: Duration::from_mins(15 * 60),
                 credential: AuthenticatingUser::InvokingUser,
                 pwfeedback: false,
                 password_timeout: Some(Duration::from_secs(300)),

src/system/time.rs

@@ -54,9 +54,9 @@ impl SystemTime {
     }
 
     #[inline]
-    pub fn checked_add(self, rhs: Duration) -> Option<SystemTime> {
-        let rhs_secs = rhs.as_nanos().div_euclid(1_000_000_000).try_into().ok()?;
-        let rhs_nsecs = rhs.as_nanos().rem_euclid(1_000_000_000).try_into().ok()?;
+    fn checked_add(self, rhs: Duration) -> Option<SystemTime> {
+        let rhs_secs = rhs.as_secs().try_into().ok()?;
+        let rhs_nsecs = rhs.subsec_nanos().try_into().ok()?;
 
         let secs = self.secs.checked_add(rhs_secs)?;
         let nsecs = self.nsecs.checked_add(rhs_nsecs)?;
@@ -65,9 +65,9 @@ impl SystemTime {
     }
 
     #[inline]
-    pub fn checked_sub(self, rhs: Duration) -> Option<SystemTime> {
-        let rhs_secs = rhs.as_nanos().div_euclid(1_000_000_000).try_into().ok()?;
-        let rhs_nsecs = rhs.as_nanos().rem_euclid(1_000_000_000).try_into().ok()?;
+    fn checked_sub(self, rhs: Duration) -> Option<SystemTime> {
+        let rhs_secs = rhs.as_secs().try_into().ok()?;
+        let rhs_nsecs = rhs.subsec_nanos().try_into().ok()?;
 
         let secs = self.secs.checked_sub(rhs_secs)?;
         let nsecs = self.nsecs.checked_sub(rhs_nsecs)?;