diff options
author | 2019-06-09 16:55:24 +0900 | |
---|---|---|
committer | 2019-06-10 09:05:11 -0700 | |
commit | ed7c7b5c5845a4084eb65a364ddf259b1e17ca59 (patch) | |
tree | 112d64fb3ed7932a4517c506739fa93fac7ae1b7 | |
parent | 09772c4e77913bcf6ad029450af80a27b04772c8 (diff) | |
download | bytes-ed7c7b5c5845a4084eb65a364ddf259b1e17ca59.tar.gz bytes-ed7c7b5c5845a4084eb65a364ddf259b1e17ca59.tar.zst bytes-ed7c7b5c5845a4084eb65a364ddf259b1e17ca59.zip |
Replace try! macro with ? operator
-rw-r--r-- | src/debug.rs | 18 | ||||
-rw-r--r-- | src/serde.rs | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/debug.rs b/src/debug.rs index f8b830a..0677bc3 100644 --- a/src/debug.rs +++ b/src/debug.rs @@ -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(()) } } diff --git a/src/serde.rs b/src/serde.rs index d45caff..ff98921 100644 --- a/src/serde.rs +++ b/src/serde.rs @@ -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); } |