summaryrefslogtreecommitdiff
path: root/src/sys/uio.rs
diff options
context:
space:
mode:
authorCarl Lerche <me@carllerche.com>2015-05-28 15:46:53 -0700
committerCarl Lerche <me@carllerche.com>2015-05-28 15:46:53 -0700
commite2b08fad9c3334e2791aebc28fa1d71d0f76112b (patch)
tree6b1690264570ff9b21cc0d23b7b6251475365376 /src/sys/uio.rs
parent663091bb2873fa45663b746bccefc85f223d13d6 (diff)
downloadnix-e2b08fad9c3334e2791aebc28fa1d71d0f76112b.zip
Remove std::os::unix::io::RawFd re-export
Diffstat (limited to 'src/sys/uio.rs')
-rw-r--r--src/sys/uio.rs12
1 files changed, 6 insertions, 6 deletions
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<usize> {
+pub fn writev(fd: RawFd, iov: &[IoVec<&[u8]>]) -> Result<usize> {
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<usize> {
return Ok(res as usize)
}
-pub fn readv(fd: Fd, iov: &mut [IoVec<&mut [u8]>]) -> Result<usize> {
+pub fn readv(fd: RawFd, iov: &mut [IoVec<&mut [u8]>]) -> Result<usize> {
let res = unsafe { ffi::readv(fd, iov.as_ptr(), iov.len() as c_int) };
if res < 0 {
return Err(Error::Sys(Errno::last()));