diff options
| author | bors <bors@rust-lang.org> | 2023-07-11 04:32:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-11 04:32:22 +0000 |
| commit | 7ba605cd90d6467bda469d1cd2148ac32ea562bf (patch) | |
| tree | ff9310c9c45b53714f21338d04f168c1597c11dd /library/std | |
| parent | 83964c156db1f444050a38b2498dbd0da6d5d503 (diff) | |
| parent | 27ff8191989ff67c9e07f062d42a6ca1d1e42720 (diff) | |
Auto merge of #113540 - Mark-Simulacrum:beta-backport, r=Mark-Simulacrum
[beta] promote 1.72 r? `@Mark-Simulacrum`
Diffstat (limited to 'library/std')
| -rw-r--r-- | library/std/src/ffi/os_str.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sync/mpsc/mod.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/ffi/os_str.rs b/library/std/src/ffi/os_str.rs index fbdf7f5ecac..e7bad9d542c 100644 --- a/library/std/src/ffi/os_str.rs +++ b/library/std/src/ffi/os_str.rs @@ -1165,7 +1165,7 @@ impl<'a> From<Cow<'a, OsStr>> for OsString { } } -#[stable(feature = "str_tryfrom_osstr_impl", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "str_tryfrom_osstr_impl", since = "1.72.0")] impl<'a> TryFrom<&'a OsStr> for &'a str { type Error = crate::str::Utf8Error; diff --git a/library/std/src/sync/mpsc/mod.rs b/library/std/src/sync/mpsc/mod.rs index 71ff4237d00..c00134c8b95 100644 --- a/library/std/src/sync/mpsc/mod.rs +++ b/library/std/src/sync/mpsc/mod.rs @@ -347,7 +347,7 @@ pub struct Sender<T> { #[stable(feature = "rust1", since = "1.0.0")] unsafe impl<T: Send> Send for Sender<T> {} -#[stable(feature = "mpsc_sender_sync", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "mpsc_sender_sync", since = "1.72.0")] unsafe impl<T: Send> Sync for Sender<T> {} /// The sending-half of Rust's synchronous [`sync_channel`] type. |
