about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorVitali Lovich <vlovich@google.com>2018-02-12 21:08:14 -0800
committerVitali Lovich <vlovich@google.com>2018-02-12 21:08:14 -0800
commit97df227d19791b0e9d199be28851fb924c3c1e21 (patch)
tree0e92725cd770e332f01159c355d34abdf8036e7a /src/libstd
parent95e4dc2ad143c91d0930ea28634e6f5c54ac0812 (diff)
downloadrust-97df227d19791b0e9d199be28851fb924c3c1e21.tar.gz
rust-97df227d19791b0e9d199be28851fb924c3c1e21.zip
Fix wait_timeout value
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/sync/condvar.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/condvar.rs b/src/libstd/sync/condvar.rs
index e6a3388aa25..65235aa62a1 100644
--- a/src/libstd/sync/condvar.rs
+++ b/src/libstd/sync/condvar.rs
@@ -484,7 +484,7 @@ impl Condvar {
                 Some(timeout) => timeout,
                 None => return Ok((guard, WaitTimeoutResult(true))),
             }
-            guard = self.wait_timeout(guard, dur)?.0;
+            guard = self.wait_timeout(guard, timeout)?.0;
         }
     }