about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-07-21 18:42:05 +0200
committerGitHub <noreply@github.com>2022-07-21 18:42:05 +0200
commit84a7b23fd79b65ae4cd48d4ae8e1efbb1f380910 (patch)
treeec89781d644447f13a47e35349e84d4e9868d757
parent9610c71b1e9f312e6e7a5693348c34d259158be7 (diff)
parentbd0474d24ac6438018f02afbc66b576845c44169 (diff)
downloadrust-84a7b23fd79b65ae4cd48d4ae8e1efbb1f380910.tar.gz
rust-84a7b23fd79b65ae4cd48d4ae8e1efbb1f380910.zip
Rollup merge of #99523 - cuviper:asfd_ptrs-1.64, r=jyn514
Fix the stable version of `AsFd for Arc<T>` and `Box<T>`

These merged in #97437 for 1.64.0, apart from the main `io_safety`
feature that stabilized in 1.63.0.
-rw-r--r--library/std/src/os/fd/owned.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/os/fd/owned.rs b/library/std/src/os/fd/owned.rs
index d661a13edc5..a463bc41db7 100644
--- a/library/std/src/os/fd/owned.rs
+++ b/library/std/src/os/fd/owned.rs
@@ -356,7 +356,7 @@ impl From<OwnedFd> for crate::net::UdpSocket {
     }
 }
 
-#[stable(feature = "io_safety", since = "1.63.0")]
+#[stable(feature = "asfd_ptrs", since = "1.64.0")]
 /// This impl allows implementing traits that require `AsFd` on Arc.
 /// ```
 /// # #[cfg(any(unix, target_os = "wasi"))] mod group_cfg {
@@ -379,7 +379,7 @@ impl<T: AsFd> AsFd for crate::sync::Arc<T> {
     }
 }
 
-#[stable(feature = "io_safety", since = "1.63.0")]
+#[stable(feature = "asfd_ptrs", since = "1.64.0")]
 impl<T: AsFd> AsFd for Box<T> {
     #[inline]
     fn as_fd(&self) -> BorrowedFd<'_> {