Skip to content

Commit

Permalink
Rollup merge of rust-lang#46323 - ia0:fix_mpsc_error_conv, r=kennytm
Browse files Browse the repository at this point in the history
Fix since for mpsc_error_conversions

This is a followup of rust-lang#45506.
  • Loading branch information
kennytm committed Nov 29, 2017
2 parents a19c13a + 43323b3 commit 30f1853
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/libstd/sync/mpsc/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,7 @@ impl<T: Send> error::Error for TrySendError<T> {
}
}

#[stable(feature = "mpsc_error_conversions", since = "1.23.0")]
#[stable(feature = "mpsc_error_conversions", since = "1.24.0")]
impl<T> From<SendError<T>> for TrySendError<T> {
fn from(err: SendError<T>) -> TrySendError<T> {
match err {
Expand Down Expand Up @@ -1747,7 +1747,7 @@ impl error::Error for TryRecvError {
}
}

#[stable(feature = "mpsc_error_conversions", since = "1.23.0")]
#[stable(feature = "mpsc_error_conversions", since = "1.24.0")]
impl From<RecvError> for TryRecvError {
fn from(err: RecvError) -> TryRecvError {
match err {
Expand Down Expand Up @@ -1788,7 +1788,7 @@ impl error::Error for RecvTimeoutError {
}
}

#[stable(feature = "mpsc_error_conversions", since = "1.23.0")]
#[stable(feature = "mpsc_error_conversions", since = "1.24.0")]
impl From<RecvError> for RecvTimeoutError {
fn from(err: RecvError) -> RecvTimeoutError {
match err {
Expand Down

0 comments on commit 30f1853

Please sign in to comment.