From: bors <bors@rust-lang.org>
Date: Sat, 17 Jan 2015 03:51:34 +0000 (+0000)
Subject: auto merge of #21132 : sfackler/rust/wait_timeout, r=alexcrichton
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=378fb5846d2d8dbc5ab24a5e92794c5c39d492dc;p=rust.git

auto merge of #21132 : sfackler/rust/wait_timeout, r=alexcrichton

**The implementation is a direct adaptation of libcxx's condition_variable implementation.**

I also added a wait_timeout_with method, which matches the second overload in C++'s condition_variable. The implementation right now is kind of dumb but it works. There is an outstanding issue with it: as is it doesn't support the use case where a user doesn't care about poisoning and wants to continue through poison.

r? @alexcrichton @aturon
---

378fb5846d2d8dbc5ab24a5e92794c5c39d492dc