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/libsyntax/parse/parser.rs | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'src/libsyntax/parse/parser.rs') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 20a54228d01..6fa95afd9fb 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2752,9 +2752,8 @@ impl<'a> Parser<'a> { } }; - match parse_kleene_op(self)? { - Some(kleene_op) => return Ok((None, kleene_op)), - None => {} + if let Some(kleene_op) = parse_kleene_op(self)? { + return Ok((None, kleene_op)); } let separator = self.bump_and_get(); @@ -5691,15 +5690,12 @@ impl<'a> Parser<'a> { } _ => None }; - match nt_item { - Some(mut item) => { - self.bump(); - let mut attrs = attrs; - mem::swap(&mut item.attrs, &mut attrs); - item.attrs.extend(attrs); - return Ok(Some(P(item))); - } - None => {} + if let Some(mut item) = nt_item { + self.bump(); + let mut attrs = attrs; + mem::swap(&mut item.attrs, &mut attrs); + item.attrs.extend(attrs); + return Ok(Some(P(item))); } let lo = self.span.lo; -- cgit 1.4.1-3-g733a5