diff options
Diffstat (limited to 'src/libnative')
| -rw-r--r-- | src/libnative/io/pipe_unix.rs | 10 | ||||
| -rw-r--r-- | src/libnative/io/pipe_win32.rs | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/libnative/io/pipe_unix.rs b/src/libnative/io/pipe_unix.rs index a6d75d93d67..64acdbf7f48 100644 --- a/src/libnative/io/pipe_unix.rs +++ b/src/libnative/io/pipe_unix.rs @@ -77,8 +77,8 @@ impl Drop for Inner { } fn connect(addr: &CString, ty: libc::c_int) -> IoResult<Inner> { - let (addr, len) = if_ok!(addr_to_sockaddr_un(addr)); - let inner = Inner { fd: if_ok!(unix_socket(ty)) }; + let (addr, len) = try!(addr_to_sockaddr_un(addr)); + let inner = Inner { fd: try!(unix_socket(ty)) }; let addrp = &addr as *libc::sockaddr_storage; match retry(|| unsafe { libc::connect(inner.fd, addrp as *libc::sockaddr, @@ -90,8 +90,8 @@ fn connect(addr: &CString, ty: libc::c_int) -> IoResult<Inner> { } fn bind(addr: &CString, ty: libc::c_int) -> IoResult<Inner> { - let (addr, len) = if_ok!(addr_to_sockaddr_un(addr)); - let inner = Inner { fd: if_ok!(unix_socket(ty)) }; + let (addr, len) = try!(addr_to_sockaddr_un(addr)); + let inner = Inner { fd: try!(unix_socket(ty)) }; let addrp = &addr as *libc::sockaddr_storage; match unsafe { libc::bind(inner.fd, addrp as *libc::sockaddr, len as libc::socklen_t) @@ -198,7 +198,7 @@ impl UnixDatagram { } pub fn sendto(&mut self, buf: &[u8], dst: &CString) -> IoResult<()> { - let (dst, len) = if_ok!(addr_to_sockaddr_un(dst)); + let (dst, len) = try!(addr_to_sockaddr_un(dst)); let dstp = &dst as *libc::sockaddr_storage; let ret = retry(|| unsafe { libc::sendto(self.fd(), diff --git a/src/libnative/io/pipe_win32.rs b/src/libnative/io/pipe_win32.rs index 83731cc02a6..fc4fc0fa789 100644 --- a/src/libnative/io/pipe_win32.rs +++ b/src/libnative/io/pipe_win32.rs @@ -262,7 +262,7 @@ impl UnixStream { impl rtio::RtioPipe for UnixStream { fn read(&mut self, buf: &mut [u8]) -> IoResult<uint> { if self.read.is_none() { - self.read = Some(if_ok!(Event::new(true, false))); + self.read = Some(try!(Event::new(true, false))); } let mut bytes_read = 0; @@ -298,7 +298,7 @@ impl rtio::RtioPipe for UnixStream { fn write(&mut self, buf: &[u8]) -> IoResult<()> { if self.write.is_none() { - self.write = Some(if_ok!(Event::new(true, false))); + self.write = Some(try!(Event::new(true, false))); } let mut offset = 0; @@ -371,7 +371,7 @@ impl UnixListener { pub fn native_listen(self) -> IoResult<UnixAcceptor> { Ok(UnixAcceptor { listener: self, - event: if_ok!(Event::new(true, false)), + event: try!(Event::new(true, false)), }) } } |
