about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-08-18 17:23:45 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-08-18 17:23:45 -0700
commit708200c36a18a31651f7e607b6e4841865917043 (patch)
treed09e995934530e0a8afda2ffc4d47bc76ea7e1dc /src/libstd/sys
parent47ea0cfb6bd250c970e3a61d62bfa1b1c7bb27d4 (diff)
downloadrust-708200c36a18a31651f7e607b6e4841865917043.tar.gz
rust-708200c36a18a31651f7e607b6e4841865917043.zip
std: Add into_raw_os traits to the OS preludes
These traits were mistakenly left out of the OS-specific prelude modules when
they were added.
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/unix/ext/mod.rs2
-rw-r--r--src/libstd/sys/windows/ext/mod.rs2
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)]