From d37edef9dd088d953c5e272db37686a338c31778 Mon Sep 17 00:00:00 2001 From: "Zack M. Davis" Date: Sun, 3 Jul 2016 14:38:37 -0700 Subject: prefer `if let` to match with `None => {}` arm in some places This is a spiritual succesor to #34268/8531d581, in which we replaced a number of matches of None to the unit value with `if let` conditionals where it was judged that this made for clearer/simpler code (as would be recommended by Manishearth/rust-clippy's `single_match` lint). The same rationale applies to matches of None to the empty block. --- src/libserialize/json.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/libserialize') diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index 90b2c611603..6c4b6c4506b 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -1764,9 +1764,8 @@ impl> Parser { return self.parse_array(first); } ParseArrayComma => { - match self.parse_array_comma_or_end() { - Some(evt) => { return evt; } - None => {} + if let Some(evt) = self.parse_array_comma_or_end() { + return evt; } } ParseObject(first) => { @@ -2583,9 +2582,8 @@ impl<'a, T: Encodable> fmt::Display for AsPrettyJson<'a, T> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { let mut shim = FormatShim { inner: f }; let mut encoder = PrettyEncoder::new(&mut shim); - match self.indent { - Some(n) => encoder.set_indent(n), - None => {} + if let Some(n) = self.indent { + encoder.set_indent(n); } match self.inner.encode(&mut encoder) { Ok(_) => Ok(()), -- cgit 1.4.1-3-g733a5