From 7bb498bd7a09f024fe46fc58ea17fe44cbc68df0 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 19 Feb 2014 10:07:49 -0800
Subject: Mass rename if_ok! to try!

This "bubble up an error" macro was originally named if_ok! in order to get it
landed, but after the fact it was discovered that this name is not exactly
desirable.

The name `if_ok!` isn't immediately clear that is has much to do with error
handling, and it doesn't look fantastic in all contexts (if if_ok!(...) {}). In
general, the agreed opinion about `if_ok!` is that is came in as subpar.

The name `try!` is more invocative of error handling, it's shorter by 2 letters,
and it looks fitting in almost all circumstances. One concern about the word
`try!` is that it's too invocative of exceptions, but the belief is that this
will be overcome with documentation and examples.

Close #12037
---
 src/libnative/io/pipe_unix.rs  | 10 +++++-----
 src/libnative/io/pipe_win32.rs |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/libnative')

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)),
         })
     }
 }
-- 
cgit 1.4.1-3-g733a5