diff options
| author | Dan Gohman <dev@sunfishcode.online> | 2021-07-27 17:12:40 -0700 |
|---|---|---|
| committer | Dan Gohman <dev@sunfishcode.online> | 2021-08-19 12:02:39 -0700 |
| commit | 6486f89cbc7a041e5d48190a1f98e07af2bb842c (patch) | |
| tree | 6d17735b126e26d7465cda2fd9765af187efed42 | |
| parent | 0cb69dec57f9ad279d7ceefad26cb0d2e16107bc (diff) | |
| download | rust-6486f89cbc7a041e5d48190a1f98e07af2bb842c.tar.gz rust-6486f89cbc7a041e5d48190a1f98e07af2bb842c.zip | |
Add Owned*, Borrowed*, and As* to the preludes.
| -rw-r--r-- | library/std/src/os/unix/mod.rs | 2 | ||||
| -rw-r--r-- | library/std/src/os/wasi/mod.rs | 2 | ||||
| -rw-r--r-- | library/std/src/os/windows/mod.rs | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/library/std/src/os/unix/mod.rs b/library/std/src/os/unix/mod.rs index 6c73d4b21dd..17a02595724 100644 --- a/library/std/src/os/unix/mod.rs +++ b/library/std/src/os/unix/mod.rs @@ -108,7 +108,7 @@ pub mod prelude { pub use super::fs::{FileTypeExt, MetadataExt, OpenOptionsExt, PermissionsExt}; #[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")] - pub use super::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd}; + pub use super::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd}; #[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")] pub use super::process::{CommandExt, ExitStatusExt}; diff --git a/library/std/src/os/wasi/mod.rs b/library/std/src/os/wasi/mod.rs index 1338aa271b3..d767c149dc5 100644 --- a/library/std/src/os/wasi/mod.rs +++ b/library/std/src/os/wasi/mod.rs @@ -50,5 +50,5 @@ pub mod prelude { pub use super::fs::{DirEntryExt, FileExt, MetadataExt, OpenOptionsExt}; #[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")] - pub use super::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd}; + pub use super::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd}; } diff --git a/library/std/src/os/windows/mod.rs b/library/std/src/os/windows/mod.rs index 52ac508f9f7..9c87e584b0c 100644 --- a/library/std/src/os/windows/mod.rs +++ b/library/std/src/os/windows/mod.rs @@ -32,8 +32,11 @@ pub mod prelude { pub use super::fs::{MetadataExt, OpenOptionsExt}; #[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")] - pub use super::io::{AsRawHandle, AsRawSocket, RawHandle, RawSocket}; + pub use super::io::{ + AsHandle, AsSocket, BorrowedHandle, BorrowedSocket, FromRawHandle, FromRawSocket, + IntoRawHandle, IntoRawSocket, OptionFileHandle, OwnedHandle, OwnedSocket, + }; #[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")] - pub use super::io::{FromRawHandle, FromRawSocket, IntoRawHandle, IntoRawSocket}; + pub use super::io::{AsRawHandle, AsRawSocket, RawHandle, RawSocket}; } |