summaryrefslogtreecommitdiff
path: root/src/parse
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2021-07-16 12:03:00 +0200
committerLaurenz <laurmaedje@gmail.com>2021-07-16 12:07:15 +0200
commit5edbd3a5b58c11939ea9823c6a847ba447254cb6 (patch)
tree0b0ad36451f5a3b85bd0406fdb656cd0d2a11890 /src/parse
parent81f2f8f4c335dc399174d7c44a226bbc2cf98c8f (diff)
Use array's IntoIterator impl and nested or patterns
*yay*
Diffstat (limited to 'src/parse')
-rw-r--r--src/parse/mod.rs2
-rw-r--r--src/parse/parser.rs5
-rw-r--r--src/parse/tokens.rs2
3 files changed, 3 insertions, 6 deletions
diff --git a/src/parse/mod.rs b/src/parse/mod.rs
index 6724c559..38a489b2 100644
--- a/src/parse/mod.rs
+++ b/src/parse/mod.rs
@@ -249,7 +249,7 @@ fn expr_with(p: &mut Parser, atomic: bool, min_prec: usize) -> Option<Expr> {
// call.
if matches!(
p.peek_direct(),
- Some(Token::Excl) | Some(Token::LeftParen) | Some(Token::LeftBracket),
+ Some(Token::Excl | Token::LeftParen | Token::LeftBracket),
) {
lhs = call(p, lhs)?;
continue;
diff --git a/src/parse/parser.rs b/src/parse/parser.rs
index d4192b50..5fba961a 100644
--- a/src/parse/parser.rs
+++ b/src/parse/parser.rs
@@ -381,10 +381,7 @@ impl<'s> Parser<'s> {
/// Whether the active group ends at a newline.
fn stop_at_newline(&self) -> bool {
let active = self.groups.last().map(|group| group.kind);
- matches!(
- active,
- Some(Group::Stmt) | Some(Group::Expr) | Some(Group::Imports)
- )
+ matches!(active, Some(Group::Stmt | Group::Expr | Group::Imports))
}
/// Whether we are inside the given group.
diff --git a/src/parse/tokens.rs b/src/parse/tokens.rs
index e9af7acb..356a2f96 100644
--- a/src/parse/tokens.rs
+++ b/src/parse/tokens.rs
@@ -898,7 +898,7 @@ mod tests {
t!(Code[" /"]: large.to_string() => Float(large));
// Combined integers and floats.
- let nums = ints.iter().map(|&(k, v)| (k, v as f64)).chain(floats.iter().copied());
+ let nums = ints.iter().map(|&(k, v)| (k, v as f64)).chain(floats);
let suffixes = [
("%", Percent as fn(f64) -> Token<'static>),