diff options
| author | bors <bors@rust-lang.org> | 2015-08-22 19:38:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-08-22 19:38:25 +0000 |
| commit | 8278342a8799db8c650b44ad0275e6be2c92df52 (patch) | |
| tree | d784dca802fab8bf1e86dd02c50744e79d5698a0 /src/libstd | |
| parent | 4a1fda807e97cc2bbc12a7f15d0566d827004e48 (diff) | |
| parent | 708200c36a18a31651f7e607b6e4841865917043 (diff) | |
| download | rust-8278342a8799db8c650b44ad0275e6be2c92df52.tar.gz rust-8278342a8799db8c650b44ad0275e6be2c92df52.zip | |
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.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/unix/ext/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/ext/mod.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/ext/mod.rs b/src/libstd/sys/unix/ext/mod.rs index f7dee1a8f35..5b9f36cbc37 100644 --- a/src/libstd/sys/unix/ext/mod.rs +++ b/src/libstd/sys/unix/ext/mod.rs @@ -41,7 +41,7 @@ pub mod raw; #[stable(feature = "rust1", since = "1.0.0")] pub mod prelude { #[doc(no_inline)] - pub use super::io::{RawFd, AsRawFd, FromRawFd}; + pub use super::io::{RawFd, AsRawFd, FromRawFd, IntoRawFd}; #[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")] pub use super::ffi::{OsStrExt, OsStringExt}; #[doc(no_inline)] diff --git a/src/libstd/sys/windows/ext/mod.rs b/src/libstd/sys/windows/ext/mod.rs index 65c3c506d3c..f69c2d075e3 100644 --- a/src/libstd/sys/windows/ext/mod.rs +++ b/src/libstd/sys/windows/ext/mod.rs @@ -30,7 +30,7 @@ pub mod prelude { #[doc(no_inline)] pub use super::io::{RawSocket, RawHandle, AsRawSocket, AsRawHandle}; #[doc(no_inline)] - pub use super::io::{FromRawSocket, FromRawHandle}; + pub use super::io::{FromRawSocket, FromRawHandle, IntoRawSocket, IntoRawHandle}; #[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")] pub use super::ffi::{OsStrExt, OsStringExt}; #[doc(no_inline)] |