user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #27896 - alexcrichton:into-raw-os-prelude, r=brson

Browse source 
These traits were mistakenly left out of the OS-specific prelude modules when
they were added.
This commit is contained in:
bors 2015-08-22 19:38:25 +00:00
commit 8278342a87
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstd/sys/unix/ext/mod.rs
View file

@ -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)]

2
src/libstd/sys/windows/ext/mod.rs
View file

@ -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)]