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

2022-05-11 04:50:48 +00:00 · 2022-05-11 04:50:48 +00:00 · 3cadc11d83
commit 3cadc11d83
parent f75d02d669
1 changed files with 1 additions and 1 deletions
--- a/library/std/src/sys/unix/futex.rs
+++ b/library/std/src/sys/unix/futex.rs
@ -25,7 +25,7 @@ pub fn futex_wait(futex: &AtomicU32, expected: u32, timeout: Option<Duration>) -
    //
    // Overflows are rounded up to an infinite timeout (None).
    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());

    loop {