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/fmt | |
| 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/fmt')
| -rw-r--r-- | src/libstd/fmt/mod.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/libstd/fmt/mod.rs b/src/libstd/fmt/mod.rs index 354b812f675..9c70d34cc0f 100644 --- a/src/libstd/fmt/mod.rs +++ b/src/libstd/fmt/mod.rs @@ -702,7 +702,7 @@ pub unsafe fn write_unsafe(output: &mut io::Writer, curarg: args.iter(), }; for piece in fmt.iter() { - if_ok!(formatter.run(piece, None)); + try!(formatter.run(piece, None)); } Ok(()) } @@ -859,13 +859,13 @@ impl<'a> Formatter<'a> { for s in selectors.iter() { if s.selector == value { for piece in s.result.iter() { - if_ok!(self.run(piece, Some(value))); + try!(self.run(piece, Some(value))); } return Ok(()); } } for piece in default.iter() { - if_ok!(self.run(piece, Some(value))); + try!(self.run(piece, Some(value))); } Ok(()) } @@ -876,7 +876,7 @@ impl<'a> Formatter<'a> { ::uint::to_str_bytes(value, 10, |buf| { let valuestr = str::from_utf8(buf).unwrap(); for piece in pieces.iter() { - if_ok!(self.run(piece, Some(valuestr))); + try!(self.run(piece, Some(valuestr))); } Ok(()) }) @@ -917,12 +917,12 @@ impl<'a> Formatter<'a> { let sign = |this: &mut Formatter| { if !signprinted { if this.flags & 1 << (FlagSignPlus as uint) != 0 && positive { - if_ok!(this.buf.write(['+' as u8])); + try!(this.buf.write(['+' as u8])); } else if !positive { - if_ok!(this.buf.write(['-' as u8])); + try!(this.buf.write(['-' as u8])); } if this.flags & 1 << (FlagAlternate as uint) != 0 { - if_ok!(this.buf.write(alternate_prefix.as_bytes())); + try!(this.buf.write(alternate_prefix.as_bytes())); } signprinted = true; } @@ -939,7 +939,7 @@ impl<'a> Formatter<'a> { Some(min) => { if self.flags & 1 << (FlagSignAwareZeroPad as uint) != 0 { self.fill = '0'; - if_ok!(sign(self)); + try!(sign(self)); } self.with_padding(min - actual_len, parse::AlignRight, |me| { emit(me) @@ -1011,15 +1011,15 @@ impl<'a> Formatter<'a> { parse::AlignLeft | parse::AlignRight => self.align }; if align == parse::AlignLeft { - if_ok!(f(self)); + try!(f(self)); } let mut fill = [0u8, ..4]; let len = self.fill.encode_utf8(fill); for _ in range(0, padding) { - if_ok!(self.buf.write(fill.slice_to(len))); + try!(self.buf.write(fill.slice_to(len))); } if align == parse::AlignRight { - if_ok!(f(self)); + try!(f(self)); } Ok(()) } |
