rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rollup merge of #46323 - ia0:fix_mpsc_error_conv, r=kennytm

Browse Source 
Fix since for mpsc_error_conversions

This is a followup of #45506.
This commit is contained in:
kennytm
2017-11-29 18:37:51 +08:00
committed by GitHub
parent a19c13a698 43323b3194
commit 30f1853649
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libstd/sync/mpsc/mod.rs
View File

@@ -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> { impl<T> From<SendError<T>> for TrySendError<T> {
fn from(err: SendError<T>) -> TrySendError<T> { fn from(err: SendError<T>) -> TrySendError<T> {
match err { match err {
@@ -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 { impl From<RecvError> for TryRecvError {
fn from(err: RecvError) -> TryRecvError { fn from(err: RecvError) -> TryRecvError {
match err { match err {
@@ -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 { impl From<RecvError> for RecvTimeoutError {
fn from(err: RecvError) -> RecvTimeoutError { fn from(err: RecvError) -> RecvTimeoutError {
match err { match err {