diff options
author | Carl Lerche <me@carllerche.com> | 2015-03-24 23:25:10 -0700 |
---|---|---|
committer | Carl Lerche <me@carllerche.com> | 2015-03-24 23:25:10 -0700 |
commit | 47d2332c3c388ecf094fc1d1890a223f3189f330 (patch) | |
tree | ee7bfae92f24d00e0732158f100caecd2f75c5f2 /src/sys/uio.rs | |
parent | 2b60633c8bdd5359c317bb74e698777106befb85 (diff) | |
download | nix-47d2332c3c388ecf094fc1d1890a223f3189f330.zip |
NixResult -> nix::Result; NixError -> nix::Error
Diffstat (limited to 'src/sys/uio.rs')
-rw-r--r-- | src/sys/uio.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sys/uio.rs b/src/sys/uio.rs index 0d2072b9..62b1819b 100644 --- a/src/sys/uio.rs +++ b/src/sys/uio.rs @@ -1,7 +1,7 @@ // Silence invalid warnings due to rust-lang/rust#16719 #![allow(improper_ctypes)] -use {NixResult, NixError}; +use {Result, Error}; use errno::Errno; use fcntl::Fd; use libc::{c_int, c_void, size_t}; @@ -23,20 +23,20 @@ mod ffi { } } -pub fn writev(fd: Fd, iov: &[IoVec<&[u8]>]) -> NixResult<usize> { +pub fn writev(fd: Fd, iov: &[IoVec<&[u8]>]) -> Result<usize> { let res = unsafe { ffi::writev(fd, iov.as_ptr(), iov.len() as c_int) }; if res < 0 { - return Err(NixError::Sys(Errno::last())); + return Err(Error::Sys(Errno::last())); } return Ok(res as usize) } -pub fn readv(fd: Fd, iov: &mut [IoVec<&mut [u8]>]) -> NixResult<usize> { +pub fn readv(fd: Fd, 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(NixError::Sys(Errno::last())); + return Err(Error::Sys(Errno::last())); } return Ok(res as usize) |