about summary refs log tree commit diff
path: root/src/libstd/comm
diff options
context:
space:
mode:
authorSteven Fackler <sfackler@gmail.com>2014-04-11 20:59:18 -0700
committerSteven Fackler <sfackler@gmail.com>2014-04-13 23:47:53 -0700
commiteb0473df93b49d6a2ff50f82e435dbd2e19467c7 (patch)
treea34483e0c817fd840d7dd5e38401a5dc7883fbb6 /src/libstd/comm
parentbb9b2e0ebe63b6853a7936aa8071859e433c6597 (diff)
downloadrust-eb0473df93b49d6a2ff50f82e435dbd2e19467c7.tar.gz
rust-eb0473df93b49d6a2ff50f82e435dbd2e19467c7.zip
Make Result::{unwrap, unwrap_err} require Show
`foo.ok().unwrap()` and `foo.err().unwrap()` are the fallbacks for types
that aren't `Show`.

Closes #13379
Diffstat (limited to 'src/libstd/comm')
-rw-r--r--src/libstd/comm/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/comm/mod.rs b/src/libstd/comm/mod.rs
index 58781c01d66..e2d7a869fbc 100644
--- a/src/libstd/comm/mod.rs
+++ b/src/libstd/comm/mod.rs
@@ -496,7 +496,7 @@ impl<T: Send> Sender<T> {
                                 // This send cannot fail because the task is
                                 // asleep (we're looking at it), so the receiver
                                 // can't go away.
-                                (*a.get()).send(t).unwrap();
+                                (*a.get()).send(t).ok().unwrap();
                                 task.wake().map(|t| t.reawaken());
                                 (a, Ok(()))
                             }