---

yaml
---
r: 213939
b: refs/heads/tmp
c: 8c0aa6d64ebab528f7eb182812007155d6044972
h: refs/heads/master
i:
  213937: 60673de
  213935: ae1791a
v: v3

Author: bors

[refs]

@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: e99b1404e9b3f60dc496a8eb0a6ce9fecc7ac583
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 6eed1662af4b72a829b65d7227bdcbdff1220be9
+refs/heads/tmp: 8c0aa6d64ebab528f7eb182812007155d6044972
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: d8a9570154dfbc4032cb3a6ba8b51c6256518dcd
 refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

branches/tmp/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};
+    pub use super::io::{RawFd, AsRawFd, FromRawFd};
     #[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")]
     pub use super::ffi::{OsStrExt, OsStringExt};
     #[doc(no_inline)]

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

@@ -29,6 +29,8 @@ pub mod process;
 pub mod prelude {
     #[doc(no_inline)]
     pub use super::io::{RawSocket, RawHandle, AsRawSocket, AsRawHandle};
+    #[doc(no_inline)]
+    pub use super::io::{FromRawSocket, FromRawHandle};
     #[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")]
     pub use super::ffi::{OsStrExt, OsStringExt};
     #[doc(no_inline)]