]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #8565 : bblum/rust/select-bugfix, r=brson
authorbors <bors@rust-lang.org>
Mon, 19 Aug 2013 02:32:36 +0000 (19:32 -0700)
committerbors <bors@rust-lang.org>
Mon, 19 Aug 2013 02:32:36 +0000 (19:32 -0700)
@brson grilled me about how this bugfix worked the first time around, and it occurred to me that it didn't in the case where the task is unwinding. Now it will.

1  2 
src/libstd/select.rs

Simple merge