From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Tue, 3 Dec 2019 09:30:40 +0000 (+0100)
Subject: parse_bottom_expr: use else if
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=dd15904a4dc77a74046ffe47ce8592d06bea60a6;p=rust.git

parse_bottom_expr: use else if
---

diff --git a/src/librustc_parse/parser/expr.rs b/src/librustc_parse/parser/expr.rs
index 0792f1b3b7f..7af9b7267a8 100644
--- a/src/librustc_parse/parser/expr.rs
+++ b/src/librustc_parse/parser/expr.rs
@@ -1093,21 +1093,20 @@ macro_rules! parse_lit {
                     let (await_hi, e_kind) = self.parse_incorrect_await_syntax(lo, self.prev_span)?;
                     hi = await_hi;
                     ex = e_kind;
+                } else if !self.unclosed_delims.is_empty() && self.check(&token::Semi) {
+                    // Don't complain about bare semicolons after unclosed braces
+                    // recovery in order to keep the error count down. Fixing the
+                    // delimiters will possibly also fix the bare semicolon found in
+                    // expression context. For example, silence the following error:
+                    //
+                    //     error: expected expression, found `;`
+                    //      --> file.rs:2:13
+                    //       |
+                    //     2 |     foo(bar(;
+                    //       |             ^ expected expression
+                    self.bump();
+                    return Ok(self.mk_expr(self.token.span, ExprKind::Err, ThinVec::new()));
                 } else {
-                    if !self.unclosed_delims.is_empty() && self.check(&token::Semi) {
-                        // Don't complain about bare semicolons after unclosed braces
-                        // recovery in order to keep the error count down. Fixing the
-                        // delimiters will possibly also fix the bare semicolon found in
-                        // expression context. For example, silence the following error:
-                        //
-                        //     error: expected expression, found `;`
-                        //      --> file.rs:2:13
-                        //       |
-                        //     2 |     foo(bar(;
-                        //       |             ^ expected expression
-                        self.bump();
-                        return Ok(self.mk_expr(self.token.span, ExprKind::Err, ThinVec::new()));
-                    }
                     parse_lit!()
                 }
             }