bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Mark expr_requires_semi_to_be_stmt call sites

Browse source 
For each of these, we need to decide whether they need to be using
`expr_requires_semi_to_be_stmt`, or `expr_requires_comma_to_be_match_arm`,
which are supposed to be 2 different behaviors. Previously they were
conflated into one, causing either too much or too little
parenthesization.
This commit is contained in:
David Tolnay 2023-12-29 16:28:47 -08:00
parent b431eec6f2
commit cbb8714a3f
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
6 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_parse/src/parser/expr.rs
View file

@ -498,7 +498,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..=`.
@ -2694,7 +2694,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,
@ -3136,7 +3136,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 {

5
compiler/rustc_parse/src/parser/stmt.rs
View file

@ -648,7 +648,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) =>
@ -662,7 +662,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.