diff options
| author | kennytm <kennytm@gmail.com> | 2017-11-29 18:37:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-29 18:37:51 +0800 |
| commit | 30f1853649a7a54c0d78a87f73d406feeb33d97c (patch) | |
| tree | 307ab7abba5e2590b2fca61b3cd856a489553cd6 /src/libstd | |
| parent | a19c13a698a497a0ed97241e9b233bc2309364cd (diff) | |
| parent | 43323b319466532f0fa3bfd41686c1e87958980a (diff) | |
| download | rust-30f1853649a7a54c0d78a87f73d406feeb33d97c.tar.gz rust-30f1853649a7a54c0d78a87f73d406feeb33d97c.zip | |
Rollup merge of #46323 - ia0:fix_mpsc_error_conv, r=kennytm
Fix since for mpsc_error_conversions This is a followup of #45506.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sync/mpsc/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index 27c5f9f96d9..2dd3aebe610 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -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 { @@ -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 { @@ -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 { |