[squash] change signature of get_current_time

to appease clippy
rustls · Nov 14, 2023 · c804e50 · c804e50
1 parent 8e1b05c
commit c804e50
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/rustls/src/client/client_conn.rs b/rustls/src/client/client_conn.rs
@@ -317,7 +317,7 @@ impl ClientConfig {
         let now = self
             .time_provider
             .get_current_time()
-            .map_err(|_| Error::FailedToGetCurrentTime)?;
+            .ok_or(Error::FailedToGetCurrentTime)?;
 
         Ok(now)
     }

diff --git a/rustls/src/client/hs.rs b/rustls/src/client/hs.rs
@@ -75,8 +75,7 @@ fn find_session(
             #[cfg(not(feature = "std"))]
             let now = config
                 .time_provider
-                .get_current_time()
-                .ok()?;
+                .get_current_time()?;
 
             let retrieved = persist::Retrieved::new(resuming, now);
             match retrieved.has_expired() {

diff --git a/rustls/src/server/server_conn.rs b/rustls/src/server/server_conn.rs
@@ -399,7 +399,7 @@ impl ServerConfig {
         let now = self
             .time_provider
             .get_current_time()
-            .map_err(|_| Error::FailedToGetCurrentTime)?;
+            .ok_or(Error::FailedToGetCurrentTime)?;
 
         Ok(now)
     }

diff --git a/rustls/src/server/tls12.rs b/rustls/src/server/tls12.rs
@@ -898,7 +898,7 @@ impl State<ServerConnectionData> for ExpectFinished {
                     .config
                     .time_provider
                     .get_current_time()
-                    .map_err(|_| Error::FailedToGetCurrentTime)?;
+                    .ok_or(Error::FailedToGetCurrentTime)?;
 
                 emit_ticket(
                     &self.secrets,

diff --git a/rustls/src/server/tls13.rs b/rustls/src/server/tls13.rs
@@ -319,7 +319,7 @@ mod client_hello {
                         .config
                         .time_provider
                         .get_current_time()
-                        .map_err(|_| Error::FailedToGetCurrentTime)?;
+                        .ok_or(Error::FailedToGetCurrentTime)?;
 
                     let resume = match self
                         .attempt_tls13_ticket_decryption(&psk_id.identity.0)
@@ -941,7 +941,7 @@ impl State<ServerConnectionData> for ExpectCertificate {
             .config
             .time_provider
             .get_current_time()
-            .map_err(|_| Error::FailedToGetCurrentTime)?;
+            .ok_or(Error::FailedToGetCurrentTime)?;
 
         self.config
             .verifier
@@ -1119,7 +1119,7 @@ impl ExpectFinished {
         let now = config
             .time_provider
             .get_current_time()
-            .map_err(|_| Error::FailedToGetCurrentTime)?;
+            .ok_or(Error::FailedToGetCurrentTime)?;
 
         let plain =
             get_server_session_value(transcript, suite, key_schedule, cx, &nonce, now, age_add)

diff --git a/rustls/src/time_provider.rs b/rustls/src/time_provider.rs
@@ -24,22 +24,24 @@ impl TimeProvider {
         Self::new(NoTimeProvider)
     }
 
-    pub(crate) fn get_current_time(&self) -> Result<UnixTime, ()> {
+    pub(crate) fn get_current_time(&self) -> Option<UnixTime> {
         self.inner.get_current_time()
     }
 }
 
 /// Get current time
 pub trait GetCurrentTime: Debug + Send + Sync {
-    /// Get current time
-    fn get_current_time(&self) -> Result<UnixTime, ()>;
+    /// Returns the current time
+    ///
+    /// or `None` if unable to retrieve the current time
+    fn get_current_time(&self) -> Option<UnixTime>;
 }
 
 #[derive(Debug)]
 struct NoTimeProvider;
 
 impl GetCurrentTime for NoTimeProvider {
-    fn get_current_time(&self) -> Result<UnixTime, ()> {
-        Err(())
+    fn get_current_time(&self) -> Option<UnixTime> {
+        None
     }
 }