Skip to content

Commit 8278342

Browse files
committed
Auto merge of #27896 - alexcrichton:into-raw-os-prelude, r=brson
These traits were mistakenly left out of the OS-specific prelude modules when they were added.
2 parents 4a1fda8 + 708200c commit 8278342

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/libstd/sys/unix/ext/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub mod raw;
4141
#[stable(feature = "rust1", since = "1.0.0")]
4242
pub mod prelude {
4343
#[doc(no_inline)]
44-
pub use super::io::{RawFd, AsRawFd, FromRawFd};
44+
pub use super::io::{RawFd, AsRawFd, FromRawFd, IntoRawFd};
4545
#[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")]
4646
pub use super::ffi::{OsStrExt, OsStringExt};
4747
#[doc(no_inline)]

src/libstd/sys/windows/ext/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub mod prelude {
3030
#[doc(no_inline)]
3131
pub use super::io::{RawSocket, RawHandle, AsRawSocket, AsRawHandle};
3232
#[doc(no_inline)]
33-
pub use super::io::{FromRawSocket, FromRawHandle};
33+
pub use super::io::{FromRawSocket, FromRawHandle, IntoRawSocket, IntoRawHandle};
3434
#[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")]
3535
pub use super::ffi::{OsStrExt, OsStringExt};
3636
#[doc(no_inline)]

0 commit comments

Comments
 (0)