Skip to content

Commit 30f1853

Browse files
authored
Rollup merge of rust-lang#46323 - ia0:fix_mpsc_error_conv, r=kennytm
Fix since for mpsc_error_conversions This is a followup of rust-lang#45506.
2 parents a19c13a + 43323b3 commit 30f1853

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/libstd/sync/mpsc/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1686,7 +1686,7 @@ impl<T: Send> error::Error for TrySendError<T> {
16861686
}
16871687
}
16881688

1689-
#[stable(feature = "mpsc_error_conversions", since = "1.23.0")]
1689+
#[stable(feature = "mpsc_error_conversions", since = "1.24.0")]
16901690
impl<T> From<SendError<T>> for TrySendError<T> {
16911691
fn from(err: SendError<T>) -> TrySendError<T> {
16921692
match err {
@@ -1747,7 +1747,7 @@ impl error::Error for TryRecvError {
17471747
}
17481748
}
17491749

1750-
#[stable(feature = "mpsc_error_conversions", since = "1.23.0")]
1750+
#[stable(feature = "mpsc_error_conversions", since = "1.24.0")]
17511751
impl From<RecvError> for TryRecvError {
17521752
fn from(err: RecvError) -> TryRecvError {
17531753
match err {
@@ -1788,7 +1788,7 @@ impl error::Error for RecvTimeoutError {
17881788
}
17891789
}
17901790

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

0 commit comments

Comments
 (0)