From 99f80ec032e6b3ae3ae84d00e0f02726d951c943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= Date: Sat, 10 Jan 2015 13:40:04 +0100 Subject: [PATCH] libs: Replace AsRawFd implementations with generic AsInner --- src/libstd/sys/unix/ext.rs | 52 ++------------------------------------ 1 file changed, 2 insertions(+), 50 deletions(-) diff --git a/src/libstd/sys/unix/ext.rs b/src/libstd/sys/unix/ext.rs index 4a82b2807e7a3..da027d0be96ee 100644 --- a/src/libstd/sys/unix/ext.rs +++ b/src/libstd/sys/unix/ext.rs @@ -37,7 +37,7 @@ use sys_common::{AsInner, IntoInner, FromInner}; use ffi::{OsStr, OsString}; use libc; -use old_io; +use sys::fs::FileDesc; /// Raw file descriptors. pub type Fd = libc::c_int; @@ -48,55 +48,7 @@ pub trait AsRawFd { fn as_raw_fd(&self) -> Fd; } -impl AsRawFd for old_io::fs::File { - fn as_raw_fd(&self) -> Fd { - self.as_inner().fd() - } -} - -impl AsRawFd for old_io::pipe::PipeStream { - fn as_raw_fd(&self) -> Fd { - self.as_inner().fd() - } -} - -impl AsRawFd for old_io::net::pipe::UnixStream { - fn as_raw_fd(&self) -> Fd { - self.as_inner().fd() - } -} - -impl AsRawFd for old_io::net::pipe::UnixListener { - fn as_raw_fd(&self) -> Fd { - self.as_inner().fd() - } -} - -impl AsRawFd for old_io::net::pipe::UnixAcceptor { - fn as_raw_fd(&self) -> Fd { - self.as_inner().fd() - } -} - -impl AsRawFd for old_io::net::tcp::TcpStream { - fn as_raw_fd(&self) -> Fd { - self.as_inner().fd() - } -} - -impl AsRawFd for old_io::net::tcp::TcpListener { - fn as_raw_fd(&self) -> Fd { - self.as_inner().fd() - } -} - -impl AsRawFd for old_io::net::tcp::TcpAcceptor { - fn as_raw_fd(&self) -> Fd { - self.as_inner().fd() - } -} - -impl AsRawFd for old_io::net::udp::UdpSocket { +impl AsRawFd for T where T: AsInner { fn as_raw_fd(&self) -> Fd { self.as_inner().fd() }