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
This commit is contained in:
parent
06e1281198
commit
7bb498bd7a
32 changed files with 1222 additions and 1226 deletions
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
use std::str;
|
||||
|
||||
macro_rules! if_ok( ($e:expr) => (
|
||||
macro_rules! try( ($e:expr) => (
|
||||
match $e { Ok(e) => e, Err(e) => { self.last_error = Err(e); return } }
|
||||
) )
|
||||
|
||||
|
|
@ -665,18 +665,18 @@ pub mod writer {
|
|||
write_vuint(self.writer, tag_id);
|
||||
|
||||
// Write a placeholder four-byte size.
|
||||
self.size_positions.push(if_ok!(self.writer.tell()) as uint);
|
||||
self.size_positions.push(try!(self.writer.tell()) as uint);
|
||||
let zeroes: &[u8] = &[0u8, 0u8, 0u8, 0u8];
|
||||
if_ok!(self.writer.write(zeroes));
|
||||
try!(self.writer.write(zeroes));
|
||||
}
|
||||
|
||||
pub fn end_tag(&mut self) {
|
||||
let last_size_pos = self.size_positions.pop().unwrap();
|
||||
let cur_pos = if_ok!(self.writer.tell());
|
||||
if_ok!(self.writer.seek(last_size_pos as i64, io::SeekSet));
|
||||
let cur_pos = try!(self.writer.tell());
|
||||
try!(self.writer.seek(last_size_pos as i64, io::SeekSet));
|
||||
let size = (cur_pos as uint - last_size_pos - 4);
|
||||
write_sized_vuint(self.writer, size, 4u);
|
||||
if_ok!(self.writer.seek(cur_pos as i64, io::SeekSet));
|
||||
try!(self.writer.seek(cur_pos as i64, io::SeekSet));
|
||||
|
||||
debug!("End tag (size = {})", size);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue