Skip to content

Commit 448215d

Browse files
committed
Implement From<SendError<T>> for TrySendError<T>
1 parent 73ed6cf commit 448215d

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

src/libstd/sync/mpsc/mod.rs

+11-2
Original file line numberDiff line numberDiff line change
@@ -1625,6 +1625,15 @@ impl<T: Send> error::Error for TrySendError<T> {
16251625
}
16261626
}
16271627

1628+
#[stable(feature = "mpsc_error_conversions", since = "1.23.0")]
1629+
impl<T> From<SendError<T>> for TrySendError<T> {
1630+
fn from(err: SendError<T>) -> TrySendError<T> {
1631+
match err {
1632+
SendError(t) => TrySendError::Disconnected(t),
1633+
}
1634+
}
1635+
}
1636+
16281637
#[stable(feature = "rust1", since = "1.0.0")]
16291638
impl fmt::Display for RecvError {
16301639
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -1677,7 +1686,7 @@ impl error::Error for TryRecvError {
16771686
}
16781687
}
16791688

1680-
#[stable(feature = "mpsc_recv_error_from", since = "1.23.0")]
1689+
#[stable(feature = "mpsc_error_conversions", since = "1.23.0")]
16811690
impl From<RecvError> for TryRecvError {
16821691
fn from(err: RecvError) -> TryRecvError {
16831692
match err {
@@ -1718,7 +1727,7 @@ impl error::Error for RecvTimeoutError {
17181727
}
17191728
}
17201729

1721-
#[stable(feature = "mpsc_recv_error_from", since = "1.23.0")]
1730+
#[stable(feature = "mpsc_error_conversions", since = "1.23.0")]
17221731
impl From<RecvError> for RecvTimeoutError {
17231732
fn from(err: RecvError) -> RecvTimeoutError {
17241733
match err {

0 commit comments

Comments
 (0)