nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-24 15:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test parenthesization of leftmost subexprs containing stmt boundaries

Browse Source
This commit is contained in:
David Tolnay 2023-12-11 23:10:17 -08:00
parent e999d8b6e1
commit 527e2eac17
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
tests/ui/macros/stringify.rs
View File

@ -204,6 +204,17 @@ fn test_expr() {
} ],
"match self { Ok => 1, Err => 0, }"
);
macro_rules! c2_match_arm {
([ $expr:expr ], $expr_expected:expr, $tokens_expected:expr $(,)?) => {
c2!(expr, [ match () { _ => $expr } ], $expr_expected, $tokens_expected);
};
}
c2_match_arm!(
[ { 1 } - 1 ],
// FIXME(dtolnay): this is invalid syntax, needs parens.
"match () { _ => { 1 } - 1, }",
"match() { _ => { 1 } - 1 }",
);
// ExprKind::Closure
c1!(expr, [ || {} ], "|| {}");
@ -651,6 +662,17 @@ fn test_stmt() {
"let (a, b): (u32, u32) = (1, 2);",
"let(a, b): (u32, u32) = (1, 2)" // FIXME
);
macro_rules! c2_let_expr_minus_one {
([ $expr:expr ], $stmt_expected:expr, $tokens_expected:expr $(,)?) => {
c2!(stmt, [ let _ = $expr - 1 ], $stmt_expected, $tokens_expected);
};
}
c2_let_expr_minus_one!(
[ match void {} ],
// FIXME(dtolnay): no parens needed.
"let _ = (match void {}) - 1;",
"let _ = match void {} - 1",
);
// StmtKind::Item
c1!(stmt, [ struct S; ], "struct S;");
@ -661,6 +683,50 @@ fn test_stmt() {
// StmtKind::Semi
c2!(stmt, [ 1 + 1 ], "1 + 1;", "1 + 1");
macro_rules! c2_expr_as_stmt {
// Parse as expr, then reparse as stmt.
//
// The c2_minus_one macro below can't directly call `c2!(stmt, ...)`
// because `$expr - 1` cannot be parsed directly as a stmt. A statement
// boundary occurs after the `match void {}`, after which the `-` token
// hits "no rules expected this token in macro call".
//
// The unwanted statement boundary is exactly why the pretty-printer is
// injecting parentheses around the subexpression, which is the behavior
// we are interested in testing.
([ $expr:expr ], $stmt_expected:expr, $tokens_expected:expr $(,)?) => {
c2!(stmt, [ $expr ], $stmt_expected, $tokens_expected);
};
}
macro_rules! c2_minus_one {
([ $expr:expr ], $stmt_expected:expr, $tokens_expected:expr $(,)?) => {
c2_expr_as_stmt!([ $expr - 1 ], $stmt_expected, $tokens_expected);
};
}
c2_minus_one!(
[ match void {} ],
"(match void {}) - 1;",
// FIXME(dtolnay): no parens expected.
"(match void {}) - 1",
);
c2_minus_one!(
[ match void {}() ],
// FIXME(dtolnay): needs parens around match.
"match void {}() - 1;",
"match void {}() - 1",
);
c2_minus_one!(
[ match void {}[0] ],
// FIXME(dtolnay): needs parens around match.
"match void {}[0] - 1;",
"match void {}[0] - 1",
);
c2_minus_one!(
[ loop { break 1; } ],
// FIXME(dtolnay): needs parens around loop.
"loop { break 1; } - 1;",
"loop { break 1; } - 1",
);
// StmtKind::Empty
c1!(stmt, [ ; ], ";");