From 7bb498bd7a09f024fe46fc58ea17fe44cbc68df0 Mon Sep 17 00:00:00 2001 From: Alex Crichton 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/libsemver/lib.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/libsemver') 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(()) -- cgit 1.4.1-3-g733a5