nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>
This commit is contained in:
the8472 2021-08-16 00:01:41 +02:00 committed by GitHub
parent a98a30976b
commit 7256a6a86d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/std/src/time/monotonic.rs
View File

@ -34,14 +34,14 @@ pub mod inner {
let packed = (secs << 32) | nanos; let packed = (secs << 32) | nanos;
let old = MONO.load(Relaxed); let old = MONO.load(Relaxed);
if packed == UNINITIALIZED || packed.wrapping_sub(old) < u64::MAX / 2 { if old == UNINITIALIZED || packed.wrapping_sub(old) < u64::MAX / 2 {
MONO.store(packed, Relaxed); MONO.store(packed, Relaxed);
raw raw
} else { } else {
// Backslide occurred. We reconstruct monotonized time by assuming the clock will never // Backslide occurred. We reconstruct monotonized time by assuming the clock will never
// backslide more than 2`32 seconds which means we can reuse the upper 32bits from // backslide more than 2`32 seconds which means we can reuse the upper 32bits from
// the seconds. // the seconds.
let secs = (secs & 0xffff_ffff << 32) | old >> 32; let secs = (secs & 0xffff_ffff_0000_0000) | old >> 32;
let nanos = old as u32; let nanos = old as u32;
ZERO.checked_add_duration(&Duration::new(secs, nanos)).unwrap() ZERO.checked_add_duration(&Duration::new(secs, nanos)).unwrap()
} }