Skip to content

Commit

Permalink
Rollup merge of rust-lang#99523 - cuviper:asfd_ptrs-1.64, r=jyn514
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
matthiaskrgr authored Jul 21, 2022
2 parents 9610c71 + bd0474d commit 84a7b23
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions library/std/src/os/fd/owned.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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<'_> {
Expand Down

0 comments on commit 84a7b23

Please sign in to comment.