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/libsemver | |
| 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/libsemver')
| -rw-r--r-- | src/libsemver/lib.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libsemver/lib.rs b/src/libsemver/lib.rs index 6c794e031ab..d03d230d8bf 100644 --- a/src/libsemver/lib.rs +++ b/src/libsemver/lib.rs @@ -99,19 +99,19 @@ pub struct Version { impl fmt::Show for Version { #[inline] fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - if_ok!(write!(f.buf, "{}.{}.{}", self.major, self.minor, self.patch)) + try!(write!(f.buf, "{}.{}.{}", self.major, self.minor, self.patch)) if !self.pre.is_empty() { - if_ok!(write!(f.buf, "-")); + try!(write!(f.buf, "-")); for (i, x) in self.pre.iter().enumerate() { - if i != 0 { if_ok!(write!(f.buf, ".")) }; - if_ok!(x.fmt(f)); + if i != 0 { try!(write!(f.buf, ".")) }; + try!(x.fmt(f)); } } if !self.build.is_empty() { - if_ok!(write!(f.buf, "+")); + try!(write!(f.buf, "+")); for (i, x) in self.build.iter().enumerate() { - if i != 0 { if_ok!(write!(f.buf, ".")) }; - if_ok!(x.fmt(f)); + if i != 0 { try!(write!(f.buf, ".")) }; + try!(x.fmt(f)); } } Ok(()) |
