From a6f17f74368ffdf917f47647096f34a815a6337e Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 25 Sep 2021 13:27:53 +0300
Subject: [PATCH] minor: more readable code

---
 crates/parser/src/grammar/expressions.rs | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/crates/parser/src/grammar/expressions.rs b/crates/parser/src/grammar/expressions.rs
index 29310b71bd..a627ca70d9 100644
--- a/crates/parser/src/grammar/expressions.rs
+++ b/crates/parser/src/grammar/expressions.rs
@@ -1,8 +1,9 @@
 mod atom;
 
+use super::*;
+
 pub(crate) use self::atom::{block_expr, match_arm_list};
 pub(super) use self::atom::{literal, LITERAL_FIRST};
-use super::*;
 
 pub(super) enum StmtWithSemi {
     Yes,
@@ -47,11 +48,6 @@ fn expr_no_struct(p: &mut Parser) {
     expr_bp(p, r, 1);
 }
 
-fn is_expr_stmt_attr_allowed(kind: SyntaxKind) -> bool {
-    let forbid = matches!(kind, BIN_EXPR | RANGE_EXPR);
-    !forbid
-}
-
 pub(super) fn stmt(p: &mut Parser, with_semi: StmtWithSemi, prefer_expr: bool) {
     let m = p.start();
     // test attr_on_expr_stmt
@@ -79,13 +75,15 @@ pub(super) fn stmt(p: &mut Parser, with_semi: StmtWithSemi, prefer_expr: bool) {
     let (cm, blocklike) = expr_stmt(p);
     let kind = cm.as_ref().map(|cm| cm.kind()).unwrap_or(ERROR);
 
-    if has_attrs && !is_expr_stmt_attr_allowed(kind) {
-        // test_err attr_on_expr_not_allowed
-        // fn foo() {
-        //    #[A] 1 + 2;
-        //    #[B] if true {};
-        // }
-        p.error(format!("attributes are not allowed on {:?}", kind));
+    if has_attrs {
+        if matches!(kind, BIN_EXPR | RANGE_EXPR) {
+            // test_err attr_on_expr_not_allowed
+            // fn foo() {
+            //    #[A] 1 + 2;
+            //    #[B] if true {};
+            // }
+            p.error(format!("attributes are not allowed on {:?}", kind));
+        }
     }
 
     if p.at(T!['}']) || (prefer_expr && p.at(EOF)) {