about summary refs log tree commit diff
path: root/src/libstd/tuple.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-02-19 10:07:49 -0800
committerAlex Crichton <alex@alexcrichton.com>2014-02-20 09:16:52 -0800
commit7bb498bd7a09f024fe46fc58ea17fe44cbc68df0 (patch)
tree0b2c13f496240db6bea8182760920d6e9efd89e7 /src/libstd/tuple.rs
parent06e1281198da31219b89a7cdb32f3c05b76afc07 (diff)
downloadrust-7bb498bd7a09f024fe46fc58ea17fe44cbc68df0.tar.gz
rust-7bb498bd7a09f024fe46fc58ea17fe44cbc68df0.zip
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
Diffstat (limited to 'src/libstd/tuple.rs')
-rw-r--r--src/libstd/tuple.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/tuple.rs b/src/libstd/tuple.rs
index 7a81e69f30a..b0d51cba103 100644
--- a/src/libstd/tuple.rs
+++ b/src/libstd/tuple.rs
@@ -161,9 +161,9 @@ macro_rules! write_tuple {
         write!($buf, "({},)", *$x)
     );
     ($buf:expr, $hd:expr, $($tl:expr),+) => ({
-        if_ok!(write!($buf, "("));
-        if_ok!(write!($buf, "{}", *$hd));
-        $(if_ok!(write!($buf, ", {}", *$tl));)+
+        try!(write!($buf, "("));
+        try!(write!($buf, "{}", *$hd));
+        $(try!(write!($buf, ", {}", *$tl));)+
         write!($buf, ")")
     });
 }