|
9 | 9 | T: TimeNow, |
10 | 10 | { |
11 | 11 | fn now(length: &PeriodLength) -> Option<Result<SinceUnixEpochPeriods, TryFromIntError>> { |
12 | | - match T::now().as_nanos().checked_div((*length).as_nanos()) { |
13 | | - None => None, |
14 | | - Some(count) => Some(match PeriodCount::try_from(count) { |
| 12 | + T::now() |
| 13 | + .as_nanos() |
| 14 | + .checked_div((*length).as_nanos()) |
| 15 | + .map(|count| match PeriodCount::try_from(count) { |
15 | 16 | Err(error) => Err(error), |
16 | | - Ok(count) => Ok(SinceUnixEpochPeriods::new(&length, &count)), |
17 | | - }), |
18 | | - } |
| 17 | + Ok(count) => Ok(SinceUnixEpochPeriods::new(length, &count)), |
| 18 | + }) |
19 | 19 | } |
20 | 20 |
|
21 | 21 | fn now_add(length: &PeriodLength, add_time: &Duration) -> Option<Result<SinceUnixEpochPeriods, TryFromIntError>> { |
22 | 22 | match T::add(add_time) { |
23 | 23 | None => None, |
24 | | - Some(time) => match time.as_nanos().checked_div(length.as_nanos()) { |
25 | | - None => None, |
26 | | - Some(count) => Some(match PeriodCount::try_from(count) { |
| 24 | + Some(time) => time |
| 25 | + .as_nanos() |
| 26 | + .checked_div(length.as_nanos()) |
| 27 | + .map(|count| match PeriodCount::try_from(count) { |
27 | 28 | Err(error) => Err(error), |
28 | | - Ok(count) => Ok(SinceUnixEpochPeriods::new(&length, &count)), |
| 29 | + Ok(count) => Ok(SinceUnixEpochPeriods::new(length, &count)), |
29 | 30 | }), |
30 | | - }, |
31 | 31 | } |
32 | 32 | } |
33 | 33 | fn now_sub(length: &PeriodLength, sub_time: &Duration) -> Option<Result<SinceUnixEpochPeriods, TryFromIntError>> { |
34 | 34 | match T::sub(sub_time) { |
35 | 35 | None => None, |
36 | | - Some(time) => match time.as_nanos().checked_div(length.as_nanos()) { |
37 | | - None => None, |
38 | | - Some(count) => Some(match PeriodCount::try_from(count) { |
| 36 | + Some(time) => time |
| 37 | + .as_nanos() |
| 38 | + .checked_div(length.as_nanos()) |
| 39 | + .map(|count| match PeriodCount::try_from(count) { |
39 | 40 | Err(error) => Err(error), |
40 | | - Ok(count) => Ok(SinceUnixEpochPeriods::new(&length, &count)), |
| 41 | + Ok(count) => Ok(SinceUnixEpochPeriods::new(length, &count)), |
41 | 42 | }), |
42 | | - }, |
43 | 43 | } |
44 | 44 | } |
45 | 45 | } |
|
0 commit comments