Replace filter_map and bool::then with filter and map.

olson-sean-k · Nov 16, 2023 · 303b5d6 · 303b5d6
1 parent 89c6313
commit 303b5d6
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/diagnostics/miette.rs b/src/diagnostics/miette.rs
@@ -50,14 +50,19 @@ pub fn diagnose<'i, 't>(
                     }) as BoxedDiagnostic
                 }),
         )
-        .chain(tokenized.tokens().last().into_iter().filter_map(|token| {
-            matches!(token.kind(), TokenKind::Separator(_)).then(|| {
-                Box::new(TerminatingSeparatorWarning {
-                    expression: tokenized.expression().clone(),
-                    span: (*token.annotation()).into(),
-                }) as BoxedDiagnostic
-            })
-        }))
+        .chain(
+            tokenized
+                .tokens()
+                .last()
+                .into_iter()
+                .filter(|token| matches!(token.kind(), TokenKind::Separator(_)))
+                .map(|token| {
+                    Box::new(TerminatingSeparatorWarning {
+                        expression: tokenized.expression().clone(),
+                        span: (*token.annotation()).into(),
+                    }) as BoxedDiagnostic
+                }),
+        )
 }
 
 // These tests exercise `Glob` APIs, which wrap functions in this module.