diff options
| author | bors <bors@rust-lang.org> | 2015-11-18 19:49:33 +0000 | 
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-11-18 19:49:33 +0000 | 
| commit | 22e31f10c22112b486f4999f90e4ba9c7e23b9b6 (patch) | |
| tree | 28e9ca0bf181ccff4f1e5fa6e929c1c714df9ce7 /src/libstd/sys/unix/ext | |
| parent | 3c68f646e957065fe5fabd4af850abaa8c4ee0af (diff) | |
| parent | 64b90f81c3ec2cf5564ed8456d836516491b9d01 (diff) | |
| download | rust-22e31f10c22112b486f4999f90e4ba9c7e23b9b6.tar.gz rust-22e31f10c22112b486f4999f90e4ba9c7e23b9b6.zip | |
Auto merge of #29083 - petrochenkov:stability3, r=alexcrichton
What this patch does: - Stability annotations are now based on "exported items" supplied by rustc_privacy and not "public items". Exported items are as accessible for external crates as directly public items and should be annotated with stability attributes. - Trait impls require annotations now. - Reexports require annotations now. - Crates themselves didn't require annotations, now they do. - Exported macros are annotated now, but these annotations are not used yet. - Some useless annotations are detected and result in errors - Finally, some small bugs are fixed - deprecation propagates from stable deprecated parents, items in blocks are traversed correctly (fixes https://github.com/rust-lang/rust/issues/29034) + some code cleanup.
Diffstat (limited to 'src/libstd/sys/unix/ext')
| -rw-r--r-- | src/libstd/sys/unix/ext/fs.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/unix/ext/mod.rs | 6 | ||||
| -rw-r--r-- | src/libstd/sys/unix/ext/process.rs | 3 | ||||
| -rw-r--r-- | src/libstd/sys/unix/ext/raw.rs | 2 | 
4 files changed, 12 insertions, 3 deletions
| diff --git a/src/libstd/sys/unix/ext/fs.rs b/src/libstd/sys/unix/ext/fs.rs index 5ef37ae51c9..d2a16b5de97 100644 --- a/src/libstd/sys/unix/ext/fs.rs +++ b/src/libstd/sys/unix/ext/fs.rs @@ -153,6 +153,7 @@ pub trait MetadataExt { fn blocks(&self) -> raw::blkcnt_t; } +#[stable(feature = "metadata_ext", since = "1.1.0")] impl MetadataExt for fs::Metadata { fn dev(&self) -> raw::dev_t { self.as_raw_stat().st_dev as raw::dev_t } fn ino(&self) -> raw::ino_t { self.as_raw_stat().st_ino as raw::ino_t } @@ -211,6 +212,7 @@ pub trait DirEntryExt { fn ino(&self) -> raw::ino_t; } +#[stable(feature = "dir_entry_ext", since = "1.1.0")] impl DirEntryExt for fs::DirEntry { fn ino(&self) -> raw::ino_t { self.as_inner().ino() } } @@ -253,6 +255,8 @@ pub trait DirBuilderExt { fn mode(&mut self, mode: raw::mode_t) -> &mut Self; } +#[unstable(feature = "dir_builder", reason = "recently added API", + issue = "27710")] impl DirBuilderExt for fs::DirBuilder { fn mode(&mut self, mode: raw::mode_t) -> &mut fs::DirBuilder { self.as_inner_mut().set_mode(mode); diff --git a/src/libstd/sys/unix/ext/mod.rs b/src/libstd/sys/unix/ext/mod.rs index 5b9f36cbc37..b57e325089d 100644 --- a/src/libstd/sys/unix/ext/mod.rs +++ b/src/libstd/sys/unix/ext/mod.rs @@ -40,13 +40,13 @@ pub mod raw; /// Includes all extension traits, and some important type definitions. #[stable(feature = "rust1", since = "1.0.0")] pub mod prelude { - #[doc(no_inline)] + #[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")] 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)] + #[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")] pub use super::fs::{PermissionsExt, OpenOptionsExt, MetadataExt, FileTypeExt}; - #[doc(no_inline)] + #[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")] pub use super::fs::{DirEntryExt}; #[doc(no_inline)] #[stable(feature = "rust1", since = "1.0.0")] pub use super::process::{CommandExt, ExitStatusExt}; diff --git a/src/libstd/sys/unix/ext/process.rs b/src/libstd/sys/unix/ext/process.rs index 3e7260f0757..e1111f25db7 100644 --- a/src/libstd/sys/unix/ext/process.rs +++ b/src/libstd/sys/unix/ext/process.rs @@ -107,18 +107,21 @@ impl AsRawFd for process::ChildStderr { } } +#[stable(feature = "process_extensions", since = "1.2.0")] impl IntoRawFd for process::ChildStdin { fn into_raw_fd(self) -> RawFd { self.into_inner().into_fd().into_raw() } } +#[stable(feature = "process_extensions", since = "1.2.0")] impl IntoRawFd for process::ChildStdout { fn into_raw_fd(self) -> RawFd { self.into_inner().into_fd().into_raw() } } +#[stable(feature = "process_extensions", since = "1.2.0")] impl IntoRawFd for process::ChildStderr { fn into_raw_fd(self) -> RawFd { self.into_inner().into_fd().into_raw() diff --git a/src/libstd/sys/unix/ext/raw.rs b/src/libstd/sys/unix/ext/raw.rs index fa380abe6c5..8377e53f417 100644 --- a/src/libstd/sys/unix/ext/raw.rs +++ b/src/libstd/sys/unix/ext/raw.rs @@ -17,6 +17,8 @@ #[stable(feature = "raw_ext", since = "1.1.0")] pub type pid_t = i32; #[doc(inline)] +#[stable(feature = "raw_ext", since = "1.1.0")] pub use sys::platform::raw::{dev_t, ino_t, mode_t, nlink_t, off_t, blksize_t}; #[doc(inline)] +#[stable(feature = "raw_ext", since = "1.1.0")] pub use sys::platform::raw::{blkcnt_t, time_t}; | 
