diff options
| author | bors <bors@rust-lang.org> | 2017-04-05 16:47:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-05 16:47:45 +0000 |
| commit | 46f71a03f9b7bad2fa469113e3858ea2bdbbb5e5 (patch) | |
| tree | f1781c8eee2c19a80fc40159ebe7c9de37817f31 /src/libstd/sys | |
| parent | ad5dfecc6ae23bb7d2b8075d705011918ab4f399 (diff) | |
| parent | 97a1f4b1f4e2acc25f939ea08ff634f70e1ab58d (diff) | |
| download | rust-46f71a03f9b7bad2fa469113e3858ea2bdbbb5e5.tar.gz rust-46f71a03f9b7bad2fa469113e3858ea2bdbbb5e5.zip | |
Auto merge of #41086 - frewsxcv:rollup, r=frewsxcv
Rollup of 19 pull requests - Successful merges: #40608, #40870, #40949, #40977, #40981, #40988, #40992, #40997, #40999, #41007, #41014, #41019, #41035, #41043, #41049, #41062, #41066, #41076, #41085 - Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/ext/io.rs | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/libstd/sys/unix/ext/io.rs b/src/libstd/sys/unix/ext/io.rs index 75aa72e3cff..296235e173d 100644 --- a/src/libstd/sys/unix/ext/io.rs +++ b/src/libstd/sys/unix/ext/io.rs @@ -73,13 +73,6 @@ 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() @@ -91,14 +84,6 @@ 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 { |