Rollup merge of rust-lang#99523 - cuviper:asfd_ptrs-1.64, r=jyn514

matthiaskrgr · web-flow · commit 84a7b23fd79b · 2022-07-21T18:42:05.000+02:00
Fix the stable version of `AsFd for Arc<T>` and `Box<T>` These merged in rust-lang#97437 for 1.64.0, apart from the main `io_safety` feature that stabilized in 1.63.0.
diff --git 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<'_> {

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ impl From<OwnedFd> for crate::net::UdpSocket {`
`356`	`356`	`}`
`357`	`357`	`}`
`358`	`358`
`359`		`-#[stable(feature = "io_safety", since = "1.63.0")]`
	`359`	`+#[stable(feature = "asfd_ptrs", since = "1.64.0")]`
`360`	`360`	/// This impl allows implementing traits that require `AsFd` on Arc.
`361`	`361`	/// ```
`362`	`362`	`/// # #[cfg(any(unix, target_os = "wasi"))] mod group_cfg {`
`@@ -379,7 +379,7 @@ impl<T: AsFd> AsFd for crate::sync::Arc<T> {`
`379`	`379`	`}`
`380`	`380`	`}`
`381`	`381`
`382`		`-#[stable(feature = "io_safety", since = "1.63.0")]`
	`382`	`+#[stable(feature = "asfd_ptrs", since = "1.64.0")]`
`383`	`383`	`impl<T: AsFd> AsFd for Box<T> {`
`384`	`384`	`#[inline]`
`385`	`385`	`fn as_fd(&self) -> BorrowedFd<'_> {`