Skip to content

Commit d0d974e

Browse files
committed
clippy: apply hints for clockperiod.rs
1 parent e7eba31 commit d0d974e

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/protocol/clock/clockperiod.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@ where
99
T: TimeNow,
1010
{
1111
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) {
1516
Err(error) => Err(error),
16-
Ok(count) => Ok(SinceUnixEpochPeriods::new(&length, &count)),
17-
}),
18-
}
17+
Ok(count) => Ok(SinceUnixEpochPeriods::new(length, &count)),
18+
})
1919
}
2020

2121
fn now_add(length: &PeriodLength, add_time: &Duration) -> Option<Result<SinceUnixEpochPeriods, TryFromIntError>> {
2222
match T::add(add_time) {
2323
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) {
2728
Err(error) => Err(error),
28-
Ok(count) => Ok(SinceUnixEpochPeriods::new(&length, &count)),
29+
Ok(count) => Ok(SinceUnixEpochPeriods::new(length, &count)),
2930
}),
30-
},
3131
}
3232
}
3333
fn now_sub(length: &PeriodLength, sub_time: &Duration) -> Option<Result<SinceUnixEpochPeriods, TryFromIntError>> {
3434
match T::sub(sub_time) {
3535
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) {
3940
Err(error) => Err(error),
40-
Ok(count) => Ok(SinceUnixEpochPeriods::new(&length, &count)),
41+
Ok(count) => Ok(SinceUnixEpochPeriods::new(length, &count)),
4142
}),
42-
},
4343
}
4444
}
4545
}

0 commit comments

Comments
 (0)