Skip to content

Commit

Permalink
Replace try! macro with ? operator
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e authored and seanmonstar committed Jun 10, 2019
1 parent 09772c4 commit ed7c7b5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions src/debug.rs
Expand Up @@ -14,27 +14,27 @@ pub struct BsDebug<'a>(pub &'a [u8]);

impl<'a> fmt::Debug for BsDebug<'a> {
fn fmt(&self, fmt: &mut fmt::Formatter) -> Result<(), fmt::Error> {
try!(write!(fmt, "b\""));
write!(fmt, "b\"")?;
for &c in self.0 {
// https://doc.rust-lang.org/reference.html#byte-escapes
if c == b'\n' {
try!(write!(fmt, "\\n"));
write!(fmt, "\\n")?;
} else if c == b'\r' {
try!(write!(fmt, "\\r"));
write!(fmt, "\\r")?;
} else if c == b'\t' {
try!(write!(fmt, "\\t"));
write!(fmt, "\\t")?;
} else if c == b'\\' || c == b'"' {
try!(write!(fmt, "\\{}", c as char));
write!(fmt, "\\{}", c as char)?;
} else if c == b'\0' {
try!(write!(fmt, "\\0"));
write!(fmt, "\\0")?;
// ASCII printable
} else if c >= 0x20 && c < 0x7f {
try!(write!(fmt, "{}", c as char));
write!(fmt, "{}", c as char)?;
} else {
try!(write!(fmt, "\\x{:02x}", c));
write!(fmt, "\\x{:02x}", c)?;
}
}
try!(write!(fmt, "\""));
write!(fmt, "\"")?;
Ok(())
}
}
2 changes: 1 addition & 1 deletion src/serde.rs
Expand Up @@ -31,7 +31,7 @@ macro_rules! serde_impl {
let len = cmp::min(seq.size_hint().unwrap_or(0), 4096);
let mut values = Vec::with_capacity(len);

while let Some(value) = try!(seq.next_element()) {
while let Some(value) = seq.next_element()? {
values.push(value);
}

Expand Down

0 comments on commit ed7c7b5

Please sign in to comment.