diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-02-19 10:07:49 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-02-20 09:16:52 -0800 |
| commit | 7bb498bd7a09f024fe46fc58ea17fe44cbc68df0 (patch) | |
| tree | 0b2c13f496240db6bea8182760920d6e9efd89e7 /src/libstd/hashmap.rs | |
| parent | 06e1281198da31219b89a7cdb32f3c05b76afc07 (diff) | |
| download | rust-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/hashmap.rs')
| -rw-r--r-- | src/libstd/hashmap.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/hashmap.rs b/src/libstd/hashmap.rs index 1ac599d0654..5d4db106728 100644 --- a/src/libstd/hashmap.rs +++ b/src/libstd/hashmap.rs @@ -599,15 +599,15 @@ impl<K:Hash + Eq + Clone,V:Clone> Clone for HashMap<K,V> { impl<A: fmt::Show + Hash + Eq, B: fmt::Show> fmt::Show for HashMap<A, B> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - if_ok!(write!(f.buf, r"\{")) + try!(write!(f.buf, r"\{")) let mut first = true; for (key, value) in self.iter() { if first { first = false; } else { - if_ok!(write!(f.buf, ", ")); + try!(write!(f.buf, ", ")); } - if_ok!(write!(f.buf, "{}: {}", *key, *value)); + try!(write!(f.buf, "{}: {}", *key, *value)); } write!(f.buf, r"\}") } @@ -877,15 +877,15 @@ impl<T:Hash + Eq + Clone> Clone for HashSet<T> { impl<A: fmt::Show + Hash + Eq> fmt::Show for HashSet<A> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - if_ok!(write!(f.buf, r"\{")) + try!(write!(f.buf, r"\{")) let mut first = true; for x in self.iter() { if first { first = false; } else { - if_ok!(write!(f.buf, ", ")); + try!(write!(f.buf, ", ")); } - if_ok!(write!(f.buf, "{}", *x)); + try!(write!(f.buf, "{}", *x)); } write!(f.buf, r"\}") } |
