about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorJulien Cretin <cretin@google.com>2017-10-23 22:49:06 +0200
committerJulien Cretin <cretin@google.com>2017-10-25 00:06:28 +0200
commit73ed6cf7fb7696ced5b6487de1e14bced35be601 (patch)
tree0024ed42823257e31f6d0cc1420b41779fc5eea7 /src/libstd/sync
parent61af75437d2c80934a601b6ee59f329928fb1e54 (diff)
downloadrust-73ed6cf7fb7696ced5b6487de1e14bced35be601.tar.gz
rust-73ed6cf7fb7696ced5b6487de1e14bced35be601.zip
Implement From<RecvError> for TryRecvError and RecvTimeoutError
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/mpsc/mod.rs18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs
index 45a26e594b0..b3c4d8c40a1 100644
--- a/src/libstd/sync/mpsc/mod.rs
+++ b/src/libstd/sync/mpsc/mod.rs
@@ -1677,6 +1677,15 @@ impl error::Error for TryRecvError {
     }
 }
 
+#[stable(feature = "mpsc_recv_error_from", since = "1.23.0")]
+impl From<RecvError> for TryRecvError {
+    fn from(err: RecvError) -> TryRecvError {
+        match err {
+            RecvError => TryRecvError::Disconnected,
+        }
+    }
+}
+
 #[stable(feature = "mpsc_recv_timeout_error", since = "1.15.0")]
 impl fmt::Display for RecvTimeoutError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -1709,6 +1718,15 @@ impl error::Error for RecvTimeoutError {
     }
 }
 
+#[stable(feature = "mpsc_recv_error_from", since = "1.23.0")]
+impl From<RecvError> for RecvTimeoutError {
+    fn from(err: RecvError) -> RecvTimeoutError {
+        match err {
+            RecvError => RecvTimeoutError::Disconnected,
+        }
+    }
+}
+
 #[cfg(all(test, not(target_os = "emscripten")))]
 mod tests {
     use env;