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/libsyntax/print/pp.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/libsyntax/print/pp.rs')
| -rw-r--r-- | src/libsyntax/print/pp.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libsyntax/print/pp.rs b/src/libsyntax/print/pp.rs index f6952261723..14d8c662aae 100644 --- a/src/libsyntax/print/pp.rs +++ b/src/libsyntax/print/pp.rs @@ -299,7 +299,7 @@ impl Printer { if !self.scan_stack_empty { self.check_stack(0); let left = self.token[self.left].clone(); - if_ok!(self.advance_left(left, self.size[self.left])); + try!(self.advance_left(left, self.size[self.left])); } self.indent(0); Ok(()) @@ -377,9 +377,9 @@ impl Printer { } } let left = self.token[self.left].clone(); - if_ok!(self.advance_left(left, self.size[self.left])); + try!(self.advance_left(left, self.size[self.left])); if self.left != self.right { - if_ok!(self.check_stream()); + try!(self.check_stream()); } } Ok(()) @@ -436,7 +436,7 @@ impl Printer { self.left += 1u; self.left %= self.buf_len; let left = self.token[self.left].clone(); - if_ok!(self.advance_left(left, self.size[self.left])); + try!(self.advance_left(left, self.size[self.left])); } ret } else { @@ -491,7 +491,7 @@ impl Printer { } pub fn print_str(&mut self, s: &str) -> io::IoResult<()> { while self.pending_indentation > 0 { - if_ok!(write!(self.out, " ")); + try!(write!(self.out, " ")); self.pending_indentation -= 1; } write!(self.out, "{}", s) |
