diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-06-19 11:33:02 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-06-19 11:33:02 -0700 |
| commit | 2f7edda3b354f3d7d865197e2ea7d3672d2a68ba (patch) | |
| tree | ec15ef56b19c667b302c3d433fb6abe4de691839 | |
| parent | e99b1404e9b3f60dc496a8eb0a6ce9fecc7ac583 (diff) | |
| parent | 174d17989d0b9a6468b79ec655fbe0cff9baf594 (diff) | |
Merge pull request #26436 from brson/beta-backport
Beta backport
| -rw-r--r-- | mk/main.mk | 2 | ||||
| -rw-r--r-- | src/libstd/sys/unix/ext/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/ext/mod.rs | 2 |
3 files changed, 4 insertions, 2 deletions
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 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)] |