Skip to content

Commit d6fa01d

Browse files
committed
Fix clippy warnings
1 parent 4c13718 commit d6fa01d

1 file changed

Lines changed: 6 additions & 12 deletions

File tree

disktest-lib/src/disktest.rs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -293,20 +293,14 @@ impl Disktest {
293293

294294
let rate = if final_step {
295295
let elapsed_ms = dur_elapsed.as_millis();
296-
if elapsed_ms > 0 {
297-
let rate = (u128::from(abs_processed) * 1000) / elapsed_ms;
298-
Some(u64::try_from(rate).unwrap_or(u64::MAX))
299-
} else {
300-
None
301-
}
296+
(u128::from(abs_processed) * 1000)
297+
.checked_div(elapsed_ms)
298+
.map(|rate| u64::try_from(rate).unwrap_or(u64::MAX))
302299
} else {
303300
let rate_period_ms = (now - self.rate_count_start_time).as_millis();
304-
if rate_period_ms > 0 {
305-
let rate = (u128::from(self.rate_count) * 1000) / rate_period_ms;
306-
Some(self.rate_avg.feed(u64::try_from(rate).unwrap_or(u64::MAX)))
307-
} else {
308-
None
309-
}
301+
(u128::from(self.rate_count) * 1000)
302+
.checked_div(rate_period_ms)
303+
.map(|rate| self.rate_avg.feed(u64::try_from(rate).unwrap_or(u64::MAX)))
310304
};
311305

312306
let rate_string = if let Some(rate) = rate {

0 commit comments

Comments
 (0)