From 47d2332c3c388ecf094fc1d1890a223f3189f330 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Tue, 24 Mar 2015 23:25:10 -0700 Subject: NixResult -> nix::Result; NixError -> nix::Error --- src/sys/uio.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/sys/uio.rs') 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 { +pub fn writev(fd: Fd, iov: &[IoVec<&[u8]>]) -> Result { 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 { +pub fn readv(fd: Fd, 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(NixError::Sys(Errno::last())); + return Err(Error::Sys(Errno::last())); } return Ok(res as usize) -- cgit v1.2.3