Merge pull request #26436 from brson/beta-backport

Beta backport
rust-lang · Jun 19, 2015 · 2f7edda · 2f7edda
2 parents e99b140 + 174d179
commit 2f7edda
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/mk/main.mk b/mk/main.mk
@@ -18,7 +18,7 @@ CFG_RELEASE_NUM=1.1.0
 # An optional number to put after the label, e.g. '.2' -> '-beta.2'
 # NB Make sure it starts with a dot to conform to semver pre-release
 # versions (section 9)
-CFG_PRERELEASE_VERSION=.4
+CFG_PRERELEASE_VERSION=.5
 
 # Append a version-dependent hash to each library, so we can install different
 # versions in the same place

diff --git 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};
+    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)]

diff --git a/src/libstd/sys/windows/ext/mod.rs b/src/libstd/sys/windows/ext/mod.rs
@@ -28,6 +28,8 @@ pub mod raw;
 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)]