From 5edbd3a5b58c11939ea9823c6a847ba447254cb6 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Fri, 16 Jul 2021 12:03:00 +0200
Subject: [PATCH] Use array's IntoIterator impl and nested or patterns

*yay*
---
 src/layout/incremental.rs | 4 ++--
 src/parse/mod.rs          | 2 +-
 src/parse/parser.rs       | 5 +----
 src/parse/tokens.rs       | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/layout/incremental.rs b/src/layout/incremental.rs
index 429dc5145..ca4839b6f 100644
--- a/src/layout/incremental.rs
+++ b/src/layout/incremental.rs
@@ -227,12 +227,12 @@ impl Constraints {
 
     /// Changes all constraints by adding the `size` to them if they are `Some`.
     pub fn mutate(&mut self, size: Size, regions: &Regions) {
-        for spec in std::array::IntoIter::new([
+        for spec in [
             &mut self.min,
             &mut self.max,
             &mut self.exact,
             &mut self.base,
-        ]) {
+        ] {
             if let Some(horizontal) = spec.horizontal.as_mut() {
                 *horizontal += size.width;
             }
diff --git a/src/parse/mod.rs b/src/parse/mod.rs
index 6724c5599..38a489b27 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 d4192b50d..5fba961a2 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 e9af7acb7..356a2f968 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>),