Add a note to the ArbitraryExpressionInPattern error

This commit is contained in:
est31 2024-04-28 15:14:32 +02:00
parent 4d570eea02
commit 4284bca720
9 changed files with 39 additions and 1 deletions

View File

@ -5,6 +5,7 @@ ast_lowering_abi_specified_multiple_times =
ast_lowering_arbitrary_expression_in_pattern =
arbitrary expressions aren't allowed in patterns
.pattern_from_macro_note = the :expr fragment specifier forces the metavariable's content to be an expression
ast_lowering_argument = argument

View File

@ -368,6 +368,8 @@ pub struct NeverPatternWithGuard {
pub struct ArbitraryExpressionInPattern {
#[primary_span]
pub span: Span,
#[note(ast_lowering_pattern_from_macro_note)]
pub pattern_from_macro_note: bool,
}
#[derive(Diagnostic)]

View File

@ -339,7 +339,11 @@ fn lower_expr_within_pat(&mut self, expr: &Expr, allow_paths: bool) -> &'hir hir
ExprKind::Path(..) if allow_paths => {}
ExprKind::Unary(UnOp::Neg, inner) if matches!(inner.kind, ExprKind::Lit(_)) => {}
_ => {
let guar = self.dcx().emit_err(ArbitraryExpressionInPattern { span: expr.span });
let pattern_from_macro = expr.is_approximately_pattern();
let guar = self.dcx().emit_err(ArbitraryExpressionInPattern {
span: expr.span,
pattern_from_macro_note: pattern_from_macro,
});
return self.arena.alloc(self.expr_err(expr.span, guar));
}
}

View File

@ -3,12 +3,16 @@ error: arbitrary expressions aren't allowed in patterns
|
LL | m!(y);
| ^
|
= note: the :expr fragment specifier forces the metavariable's content to be an expression
error: arbitrary expressions aren't allowed in patterns
--> $DIR/issue-43250.rs:11:8
|
LL | m!(C);
| ^
|
= note: the :expr fragment specifier forces the metavariable's content to be an expression
error: aborting due to 2 previous errors

View File

@ -0,0 +1,11 @@
macro_rules! foo {
($p:expr) => {
if let $p = Some(42) {
return;
}
};
}
fn main() {
foo!(Some(3)); //~ ERROR arbitrary expressions aren't allowed in patterns
}

View File

@ -0,0 +1,10 @@
error: arbitrary expressions aren't allowed in patterns
--> $DIR/expr-in-pat-issue-99380.rs:10:10
|
LL | foo!(Some(3));
| ^^^^^^^
|
= note: the :expr fragment specifier forces the metavariable's content to be an expression
error: aborting due to 1 previous error

View File

@ -4,6 +4,7 @@ error: arbitrary expressions aren't allowed in patterns
LL | Some(vec![43]) => {}
| ^^^^^^^^
|
= note: the :expr fragment specifier forces the metavariable's content to be an expression
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
error: aborting due to 1 previous error

View File

@ -9,6 +9,8 @@ error: arbitrary expressions aren't allowed in patterns
|
LL | funny!(a, a);
| ^
|
= note: the :expr fragment specifier forces the metavariable's content to be an expression
error: aborting due to 2 previous errors

View File

@ -7,6 +7,7 @@ LL | () => { force_expr!(Vec::new()) }
LL | assert!(matches!(x, En::A(make_vec!())));
| ----------- in this macro invocation
|
= note: the :expr fragment specifier forces the metavariable's content to be an expression
= note: this error originates in the macro `make_vec` (in Nightly builds, run with -Z macro-backtrace for more info)
error: arbitrary expressions aren't allowed in patterns
@ -18,6 +19,7 @@ LL | () => { force_pat!(get_usize(), get_usize()) }
LL | assert!(matches!(5, make_pat!()));
| ----------- in this macro invocation
|
= note: the :expr fragment specifier forces the metavariable's content to be an expression
= note: this error originates in the macro `make_pat` (in Nightly builds, run with -Z macro-backtrace for more info)
error: arbitrary expressions aren't allowed in patterns
@ -29,6 +31,7 @@ LL | () => { force_pat!(get_usize(), get_usize()) }
LL | assert!(matches!(5, make_pat!()));
| ----------- in this macro invocation
|
= note: the :expr fragment specifier forces the metavariable's content to be an expression
= note: this error originates in the macro `make_pat` (in Nightly builds, run with -Z macro-backtrace for more info)
error: aborting due to 3 previous errors