diff options
| author | bors <bors@rust-lang.org> | 2017-03-31 16:04:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-03-31 16:04:18 +0000 |
| commit | 40feadb966f825de7aa54a3138416c906b60f54a (patch) | |
| tree | 782773130a3e3273426a8ef3380f5802a333d458 /src/libstd/sys | |
| parent | a9329d3aa3974cfe7fda57a67b3898434f410131 (diff) | |
| parent | c34f533a85529b483083c9082b5cb9ae0b711bcf (diff) | |
| download | rust-40feadb966f825de7aa54a3138416c906b60f54a.tar.gz rust-40feadb966f825de7aa54a3138416c906b60f54a.zip | |
Auto merge of #40950 - frewsxcv:rollup, r=frewsxcv
Rollup of 10 pull requests - Successful merges: #40694, #40842, #40869, #40888, #40898, #40904, #40925, #40928, #40929, #40934 - Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/ext/io.rs | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/libstd/sys/unix/ext/io.rs b/src/libstd/sys/unix/ext/io.rs index 296235e173d..75aa72e3cff 100644 --- a/src/libstd/sys/unix/ext/io.rs +++ b/src/libstd/sys/unix/ext/io.rs @@ -73,6 +73,13 @@ pub trait IntoRawFd { } #[stable(feature = "rust1", since = "1.0.0")] +impl AsRawFd for RawFd { + fn as_raw_fd(&self) -> RawFd { + *self + } +} + +#[stable(feature = "rust1", since = "1.0.0")] impl AsRawFd for fs::File { fn as_raw_fd(&self) -> RawFd { self.as_inner().fd().raw() @@ -84,6 +91,14 @@ impl FromRawFd for fs::File { fs::File::from_inner(sys::fs::File::from_inner(fd)) } } + +#[stable(feature = "into_raw_os", since = "1.4.0")] +impl IntoRawFd for RawFd { + fn into_raw_fd(self) -> RawFd { + self + } +} + #[stable(feature = "into_raw_os", since = "1.4.0")] impl IntoRawFd for fs::File { fn into_raw_fd(self) -> RawFd { |
