diff options
| author | bors <bors@rust-lang.org> | 2018-09-27 07:16:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-27 07:16:27 +0000 |
| commit | e999ebdb971a0bde03ec3fdfff901ac6613fcfa0 (patch) | |
| tree | 46af141bfedbbbed8cc2ba6d8e3686347539da7e /src/libsyntax | |
| parent | 441519536c8bd138e8c651743249acd6814747a1 (diff) | |
| parent | 2b3e16bfaabd07d87523a90e820fd2fa50377fbc (diff) | |
| download | rust-e999ebdb971a0bde03ec3fdfff901ac6613fcfa0.tar.gz rust-e999ebdb971a0bde03ec3fdfff901ac6613fcfa0.zip | |
Auto merge of #54581 - petrochenkov:cfgattr, r=alexcrichton
Accept trailing comma in `cfg_attr` Fixes https://github.com/rust-lang/rust/issues/54463 (stable-to-beta regression)
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/config.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax/config.rs b/src/libsyntax/config.rs index 3d9f4a92f81..a9ce2365577 100644 --- a/src/libsyntax/config.rs +++ b/src/libsyntax/config.rs @@ -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))) }) { |