Skip to content

Commit 2f56839

Browse files
committed
Auto merge of #26413 - alexcrichton:from-raw-fd-prelude, r=sfackler
These were just left out by mistake!
2 parents ff8fee1 + 45f830b commit 2f56839

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
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};
44+
pub use super::io::{RawFd, AsRawFd, FromRawFd};
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

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ pub mod process;
2929
pub mod prelude {
3030
#[doc(no_inline)]
3131
pub use super::io::{RawSocket, RawHandle, AsRawSocket, AsRawHandle};
32+
#[doc(no_inline)]
33+
pub use super::io::{FromRawSocket, FromRawHandle};
3234
#[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")]
3335
pub use super::ffi::{OsStrExt, OsStringExt};
3436
#[doc(no_inline)]

0 commit comments

Comments
 (0)