bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #79884 - Digital-Chaos:replace-magic, r=m-ou-se

Browse source 
Replace magic numbers with existing constants

Replaced magic numbers in `library/core/src/time.rs` with predefined constants.
This commit is contained in:
Jonas Schievink 2021-01-24 22:09:51 +01:00 • committed by GitHub
commit 3ed8a3769a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
library/core/src/time.rs
View file

@ -1067,13 +1067,23 @@ impl fmt::Debug for Duration {
} }
if self.secs > 0 { if self.secs > 0 {
fmt_decimal(f, self.secs, self.nanos, 100_000_000)?; fmt_decimal(f, self.secs, self.nanos, NANOS_PER_SEC / 10)?;
f.write_str("s") f.write_str("s")
} else if self.nanos >= 1_000_000 { } else if self.nanos >= NANOS_PER_MILLI {
fmt_decimal(f, self.nanos as u64 / 1_000_000, self.nanos % 1_000_000, 100_000)?; fmt_decimal(
f,
(self.nanos / NANOS_PER_MILLI) as u64,
self.nanos % NANOS_PER_MILLI,
NANOS_PER_MILLI / 10,
)?;
f.write_str("ms") f.write_str("ms")
} else if self.nanos >= 1_000 { } else if self.nanos >= NANOS_PER_MICRO {
fmt_decimal(f, self.nanos as u64 / 1_000, self.nanos % 1_000, 100)?; fmt_decimal(
f,
(self.nanos / NANOS_PER_MICRO) as u64,
self.nanos % NANOS_PER_MICRO,
NANOS_PER_MICRO / 10,
)?;
f.write_str("µs") f.write_str("µs")
} else { } else {
fmt_decimal(f, self.nanos as u64, 0, 1)?; fmt_decimal(f, self.nanos as u64, 0, 1)?;