From 43e1810c10c2ba95a47490d7db5bda8603116a5b Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 18 Jun 2015 16:14:50 -0700 Subject: std: Add FromRaw{Fd,Handle,Socket} to os preludes These were just left out by mistake! --- src/libstd/sys/unix/ext/mod.rs | 2 +- src/libstd/sys/windows/ext/mod.rs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libstd/sys/unix/ext/mod.rs b/src/libstd/sys/unix/ext/mod.rs index 6fde45a7301..48c77480899 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}; + 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 index 08dfa4cc877..58db1d35205 100644 --- 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)] -- cgit 1.4.1-3-g733a5 From 174d17989d0b9a6468b79ec655fbe0cff9baf594 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 19 Jun 2015 11:25:35 -0700 Subject: Bump to prerelease 5 --- mk/main.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/main.mk b/mk/main.mk index a279f5db120..4aa8d7fd785 100644 --- 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 -- cgit 1.4.1-3-g733a5