clippy: apply hints for clockperiod.rs

torrust · Sep 15, 2022 · d0d974e · d0d974e
1 parent e7eba31
commit d0d974e
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/src/protocol/clock/clockperiod.rs b/src/protocol/clock/clockperiod.rs
@@ -9,37 +9,37 @@ where
     T: TimeNow,
 {
     fn now(length: &PeriodLength) -> Option<Result<SinceUnixEpochPeriods, TryFromIntError>> {
-        match T::now().as_nanos().checked_div((*length).as_nanos()) {
-            None => None,
-            Some(count) => Some(match PeriodCount::try_from(count) {
+        T::now()
+            .as_nanos()
+            .checked_div((*length).as_nanos())
+            .map(|count| match PeriodCount::try_from(count) {
                 Err(error) => Err(error),
-                Ok(count) => Ok(SinceUnixEpochPeriods::new(&length, &count)),
-            }),
-        }
+                Ok(count) => Ok(SinceUnixEpochPeriods::new(length, &count)),
+            })
     }
 
     fn now_add(length: &PeriodLength, add_time: &Duration) -> Option<Result<SinceUnixEpochPeriods, TryFromIntError>> {
         match T::add(add_time) {
             None => None,
-            Some(time) => match time.as_nanos().checked_div(length.as_nanos()) {
-                None => None,
-                Some(count) => Some(match PeriodCount::try_from(count) {
+            Some(time) => time
+                .as_nanos()
+                .checked_div(length.as_nanos())
+                .map(|count| match PeriodCount::try_from(count) {
                     Err(error) => Err(error),
-                    Ok(count) => Ok(SinceUnixEpochPeriods::new(&length, &count)),
+                    Ok(count) => Ok(SinceUnixEpochPeriods::new(length, &count)),
                 }),
-            },
         }
     }
     fn now_sub(length: &PeriodLength, sub_time: &Duration) -> Option<Result<SinceUnixEpochPeriods, TryFromIntError>> {
         match T::sub(sub_time) {
             None => None,
-            Some(time) => match time.as_nanos().checked_div(length.as_nanos()) {
-                None => None,
-                Some(count) => Some(match PeriodCount::try_from(count) {
+            Some(time) => time
+                .as_nanos()
+                .checked_div(length.as_nanos())
+                .map(|count| match PeriodCount::try_from(count) {
                     Err(error) => Err(error),
-                    Ok(count) => Ok(SinceUnixEpochPeriods::new(&length, &count)),
+                    Ok(count) => Ok(SinceUnixEpochPeriods::new(length, &count)),
                 }),
-            },
         }
     }
 }