Skip to content

Commit ec263df

Browse files
compiler-errorscompiler-errors
committed
Suggest wrapping mac args in parens rather than the whole expression
1 parent c1c7707 commit ec263df

File tree

5 files changed

+45
-23
lines changed

5 files changed

+45
-23
lines changed

‎compiler/rustc_parse/messages.ftl

+2
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,8 @@ parse_sugg_turbofish_syntax = use `::<...>` instead of `<...>` to specify lifeti
722722
723723
parse_sugg_wrap_expression_in_parentheses = wrap the expression in parentheses
724724
725+
parse_sugg_wrap_macro_in_parentheses = use parentheses instead of braces for this macro
726+
725727
parse_sugg_wrap_pattern_in_parens = wrap the pattern in parentheses
726728
727729
parse_switch_mut_let_order =

‎compiler/rustc_parse/src/errors.rs

+25-12
Original file line numberDiff line numberDiff line change
@@ -722,19 +722,32 @@ pub(crate) struct LabeledLoopInBreak {
722722
#[primary_span]
723723
pub span: Span,
724724
#[subdiagnostic]
725-
pub sub: WrapExpressionInParentheses,
725+
pub sub: WrapInParentheses,
726726
}
727727

728728
#[derive(Subdiagnostic)]
729-
#[multipart_suggestion(
730-
parse_sugg_wrap_expression_in_parentheses,
731-
applicability = "machine-applicable"
732-
)]
733-
pub(crate) struct WrapExpressionInParentheses {
734-
#[suggestion_part(code = "(")]
735-
pub left: Span,
736-
#[suggestion_part(code = ")")]
737-
pub right: Span,
729+
730+
pub(crate) enum WrapInParentheses {
731+
#[multipart_suggestion(
732+
parse_sugg_wrap_expression_in_parentheses,
733+
applicability = "machine-applicable"
734+
)]
735+
Expression {
736+
#[suggestion_part(code = "(")]
737+
left: Span,
738+
#[suggestion_part(code = ")")]
739+
right: Span,
740+
},
741+
#[multipart_suggestion(
742+
parse_sugg_wrap_macro_in_parentheses,
743+
applicability = "machine-applicable"
744+
)]
745+
MacroArgs {
746+
#[suggestion_part(code = "(")]
747+
left: Span,
748+
#[suggestion_part(code = ")")]
749+
right: Span,
750+
},
738751
}
739752

740753
#[derive(Diagnostic)]
@@ -936,7 +949,7 @@ pub(crate) struct InvalidExpressionInLetElse {
936949
pub span: Span,
937950
pub operator: &'static str,
938951
#[subdiagnostic]
939-
pub sugg: WrapExpressionInParentheses,
952+
pub sugg: WrapInParentheses,
940953
}
941954

942955
#[derive(Diagnostic)]
@@ -945,7 +958,7 @@ pub(crate) struct InvalidCurlyInLetElse {
945958
#[primary_span]
946959
pub span: Span,
947960
#[subdiagnostic]
948-
pub sugg: WrapExpressionInParentheses,
961+
pub sugg: WrapInParentheses,
949962
}
950963

951964
#[derive(Diagnostic)]

‎compiler/rustc_parse/src/parser/expr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1844,7 +1844,7 @@ impl<'a> Parser<'a> {
18441844
let lexpr = self.parse_expr_labeled(label, true)?;
18451845
self.dcx().emit_err(errors::LabeledLoopInBreak {
18461846
span: lexpr.span,
1847-
sub: errors::WrapExpressionInParentheses {
1847+
sub: errors::WrapInParentheses::Expression {
18481848
left: lexpr.span.shrink_to_lo(),
18491849
right: lexpr.span.shrink_to_hi(),
18501850
},

‎compiler/rustc_parse/src/parser/stmt.rs

+11-4
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ impl<'a> Parser<'a> {
389389
self.dcx().emit_err(errors::InvalidExpressionInLetElse {
390390
span: init.span,
391391
operator: op.node.as_str(),
392-
sugg: errors::WrapExpressionInParentheses {
392+
sugg: errors::WrapInParentheses::Expression {
393393
left: init.span.shrink_to_lo(),
394394
right: init.span.shrink_to_hi(),
395395
},
@@ -400,12 +400,19 @@ impl<'a> Parser<'a> {
400400

401401
fn check_let_else_init_trailing_brace(&self, init: &ast::Expr) {
402402
if let Some(trailing) = classify::expr_trailing_brace(init) {
403-
self.dcx().emit_err(errors::InvalidCurlyInLetElse {
404-
span: trailing.span.with_lo(trailing.span.hi() - BytePos(1)),
405-
sugg: errors::WrapExpressionInParentheses {
403+
let sugg = match &trailing.kind {
404+
ExprKind::MacCall(mac) => errors::WrapInParentheses::MacroArgs {
405+
left: mac.args.dspan.open,
406+
right: mac.args.dspan.close,
407+
},
408+
_ => errors::WrapInParentheses::Expression {
406409
left: trailing.span.shrink_to_lo(),
407410
right: trailing.span.shrink_to_hi(),
408411
},
412+
};
413+
self.dcx().emit_err(errors::InvalidCurlyInLetElse {
414+
span: trailing.span.with_lo(trailing.span.hi() - BytePos(1)),
415+
sugg,
409416
});
410417
}
411418
}

‎tests/ui/parser/bad-let-else-statement.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,10 @@ error: right curly brace `}` before `else` in a `let...else` statement not allow
234234
LL | let bad = format_args! {""} else { return; };
235235
| ^
236236
|
237-
help: wrap the expression in parentheses
237+
help: use parentheses instead of braces for this macro
238238
|
239-
LL | let bad = (format_args! {""}) else { return; };
240-
| + +
239+
LL | let bad = format_args! ("") else { return; };
240+
| ~ ~
241241

242242
error: right curly brace `}` before `else` in a `let...else` statement not allowed
243243
--> $DIR/bad-let-else-statement.rs:181:25
@@ -249,10 +249,10 @@ LL | b!(1); b!(2);
249249
| ----- in this macro invocation
250250
|
251251
= note: this error originates in the macro `b` (in Nightly builds, run with -Z macro-backtrace for more info)
252-
help: wrap the expression in parentheses
252+
help: use parentheses instead of braces for this macro
253253
|
254-
LL | let x = (a! {}) else { return; };
255-
| + +
254+
LL | let x = a! () else { return; };
255+
| ~~
256256

257257
error: aborting due to 19 previous errors
258258

0 commit comments

Comments
 (0)