New upstream version 1.13.0+dfsg1

[rustc.git] / src / libstd / sync / mpsc / oneshot.rs

diff --git a/src/libstd/sync/mpsc/oneshot.rs b/src/libstd/sync/mpsc/oneshot.rs
index 7a35ea6bbaaa20c184116b5f1b58be4c17090acf..7389280b853dbfb87905dea8406c5ead548c3c8d 100644 (file)
--- a/src/libstd/sync/mpsc/oneshot.rs
+++ b/src/libstd/sync/mpsc/oneshot.rs
@@ -150,7 +150,7 @@ impl<T> Packet<T> {
                     let timed_out = !wait_token.wait_max_until(deadline);
                     // Try to reset the state
                     if timed_out {
-                        try!(self.abort_selection().map_err(Upgraded));
+                        self.abort_selection().map_err(Upgraded)?;
                     }
                 } else {
                     wait_token.wait();