From e2b08fad9c3334e2791aebc28fa1d71d0f76112b Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Thu, 28 May 2015 15:46:53 -0700 Subject: Remove std::os::unix::io::RawFd re-export --- src/sys/uio.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/sys/uio.rs') diff --git a/src/sys/uio.rs b/src/sys/uio.rs index 62b1819b..9f65cf09 100644 --- a/src/sys/uio.rs +++ b/src/sys/uio.rs @@ -3,27 +3,27 @@ use {Result, Error}; use errno::Errno; -use fcntl::Fd; use libc::{c_int, c_void, size_t}; use std::marker::PhantomData; +use std::os::unix::io::RawFd; mod ffi { use super::IoVec; use libc::{ssize_t, c_int}; - use fcntl::Fd; + use std::os::unix::io::RawFd; extern { // vectorized version of write // doc: http://man7.org/linux/man-pages/man2/writev.2.html - pub fn writev(fd: Fd, iov: *const IoVec<&[u8]>, iovcnt: c_int) -> ssize_t; + pub fn writev(fd: RawFd, iov: *const IoVec<&[u8]>, iovcnt: c_int) -> ssize_t; // vectorized version of read // doc: http://man7.org/linux/man-pages/man2/readv.2.html - pub fn readv(fd: Fd, iov: *const IoVec<&mut [u8]>, iovcnt: c_int) -> ssize_t; + pub fn readv(fd: RawFd, iov: *const IoVec<&mut [u8]>, iovcnt: c_int) -> ssize_t; } } -pub fn writev(fd: Fd, iov: &[IoVec<&[u8]>]) -> Result { +pub fn writev(fd: RawFd, iov: &[IoVec<&[u8]>]) -> Result { let res = unsafe { ffi::writev(fd, iov.as_ptr(), iov.len() as c_int) }; if res < 0 { @@ -33,7 +33,7 @@ pub fn writev(fd: Fd, iov: &[IoVec<&[u8]>]) -> Result { return Ok(res as usize) } -pub fn readv(fd: Fd, iov: &mut [IoVec<&mut [u8]>]) -> Result { +pub fn readv(fd: RawFd, iov: &mut [IoVec<&mut [u8]>]) -> Result { let res = unsafe { ffi::readv(fd, iov.as_ptr(), iov.len() as c_int) }; if res < 0 { return Err(Error::Sys(Errno::last())); -- cgit v1.2.3