Mark expr_requires_semi_to_be_stmt call sites

Author: dtolnay

compiler/rustc_ast/src/util/classify.rs

@@ -42,7 +42,8 @@ use crate::ast;
 ///      _ => m! {} - 1,  // binary subtraction operator
 /// }
 /// ```
-pub fn expr_requires_semi_to_be_stmt(e: &ast::Expr) -> bool {
+#[allow(non_snake_case)]
+pub fn expr_requires_semi_to_be_stmt_FIXME(e: &ast::Expr) -> bool {
     !matches!(
         e.kind,
         ast::ExprKind::If(..)

compiler/rustc_ast_pretty/src/pprust/state.rs

@@ -1101,7 +1101,7 @@ impl<'a> State<'a> {
                     false,
                     FixupContext { stmt: true, ..FixupContext::default() },
                 );
-                if classify::expr_requires_semi_to_be_stmt(expr) {
+                if classify::expr_requires_semi_to_be_stmt_FIXME(expr) {
                     self.word(";");
                 }
             }

compiler/rustc_ast_pretty/src/pprust/state/expr.rs

@@ -470,8 +470,8 @@ impl<'a> State<'a> {
         //
         // Same applies to a small set of other expression kinds which eagerly
         // terminate a statement which opens with them.
-        let needs_par =
-            fixup.leftmost_subexpression_in_stmt && !classify::expr_requires_semi_to_be_stmt(expr);
+        let needs_par = fixup.leftmost_subexpression_in_stmt
+            && !classify::expr_requires_semi_to_be_stmt_FIXME(expr);
         if needs_par {
             self.popen();
             fixup = FixupContext::default();

compiler/rustc_lint/src/unused.rs

@@ -674,7 +674,7 @@ trait UnusedDelimLint {
                     ExprKind::Index(base, _subscript, _) => base,
                     _ => break,
                 };
-                if !classify::expr_requires_semi_to_be_stmt(innermost) {
+                if !classify::expr_requires_semi_to_be_stmt_FIXME(innermost) {
                     return true;
                 }
             }

compiler/rustc_parse/src/parser/expr.rs

@@ -470,7 +470,7 @@ impl<'a> Parser<'a> {
     /// Checks if this expression is a successfully parsed statement.
     fn expr_is_complete(&self, e: &Expr) -> bool {
         self.restrictions.contains(Restrictions::STMT_EXPR)
-            && !classify::expr_requires_semi_to_be_stmt(e)
+            && !classify::expr_requires_semi_to_be_stmt_FIXME(e)
     }
 
     /// Parses `x..y`, `x..=y`, and `x..`/`x..=`.
@@ -2567,7 +2567,7 @@ impl<'a> Parser<'a> {
                 // If it's not a free-standing expression, and is followed by a block,
                 // then it's very likely the condition to an `else if`.
                     if self.check(&TokenKind::OpenDelim(Delimiter::Brace))
-                        && classify::expr_requires_semi_to_be_stmt(&cond) =>
+                        && classify::expr_requires_semi_to_be_stmt_FIXME(&cond) =>
                 {
                     self.dcx().emit_err(errors::ExpectedElseBlock {
                         first_tok_span,
@@ -2989,7 +2989,7 @@ impl<'a> Parser<'a> {
                         err
                     })?;
 
-                let require_comma = classify::expr_requires_semi_to_be_stmt(&expr)
+                let require_comma = classify::expr_requires_semi_to_be_stmt_FIXME(&expr)
                     && this.token != token::CloseDelim(Delimiter::Brace);
 
                 if !require_comma {

compiler/rustc_parse/src/parser/stmt.rs

@@ -637,7 +637,7 @@ impl<'a> Parser<'a> {
         match &mut stmt.kind {
             // Expression without semicolon.
             StmtKind::Expr(expr)
-                if classify::expr_requires_semi_to_be_stmt(expr)
+                if classify::expr_requires_semi_to_be_stmt_FIXME(expr)
                     && !expr.attrs.is_empty()
                     && ![token::Eof, token::Semi, token::CloseDelim(Delimiter::Brace)]
                         .contains(&self.token.kind) =>
@@ -651,7 +651,8 @@ impl<'a> Parser<'a> {
 
             // Expression without semicolon.
             StmtKind::Expr(expr)
-                if self.token != token::Eof && classify::expr_requires_semi_to_be_stmt(expr) =>
+                if self.token != token::Eof
+                    && classify::expr_requires_semi_to_be_stmt_FIXME(expr) =>
             {
                 // Just check for errors and recover; do not eat semicolon yet.
                 // `expect_one_of` returns PResult<'a, bool /* recovered */>