Skip to content

Accept trailing comma in cfg_attr #54581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/libsyntax/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ impl<'a> StripUnconfigured<'a> {
parser.expect(&token::Comma)?;
let lo = parser.span.lo();
let (path, tokens) = parser.parse_meta_item_unrestricted()?;
parser.eat(&token::Comma); // Optional trailing comma
parser.expect(&token::CloseDelim(token::Paren))?;
Ok((cfg, path, tokens, parser.prev_span.with_lo(lo)))
}) {
Expand Down
13 changes: 13 additions & 0 deletions src/test/ui/cfg-attr-trailing-comma.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// compile-flags: --cfg TRUE

#[cfg_attr(TRUE, inline,)] // OK
fn f() {}

#[cfg_attr(FALSE, inline,)] // OK
fn g() {}

#[cfg_attr(TRUE, inline,,)] //~ ERROR expected `)`, found `,`
fn h() {}

#[cfg_attr(FALSE, inline,,)] //~ ERROR expected `)`, found `,`
fn i() {}
14 changes: 14 additions & 0 deletions src/test/ui/cfg-attr-trailing-comma.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error: expected `)`, found `,`
--> $DIR/cfg-attr-trailing-comma.rs:9:25
|
LL | #[cfg_attr(TRUE, inline,,)] //~ ERROR expected `)`, found `,`
| ^ expected `)`

error: expected `)`, found `,`
--> $DIR/cfg-attr-trailing-comma.rs:12:26
|
LL | #[cfg_attr(FALSE, inline,,)] //~ ERROR expected `)`, found `,`
| ^ expected `)`

error: aborting due to 2 previous errors