rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

avoid using both Some() and ? on linux/android/freebsd code

Browse Source
This commit is contained in:
Sébastien Marie
2022-05-11 04:50:48 +00:00
parent f75d02d669
commit 3cadc11d83
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/std/src/sys/unix/futex.rs
View File

@@ -25,7 +25,7 @@ pub fn futex_wait(futex: &AtomicU32, expected: u32, timeout: Option<Duration>) -
// //
// Overflows are rounded up to an infinite timeout (None). // Overflows are rounded up to an infinite timeout (None).
let timespec = timeout let timespec = timeout
.and_then(|d| Some(Timespec::now(libc::CLOCK_MONOTONIC).checked_add_duration(&d)?)) .and_then(|d| Timespec::now(libc::CLOCK_MONOTONIC).checked_add_duration(&d))
.and_then(|t| t.to_timespec()); .and_then(|t| t.to_timespec());
loop { loop {