diff options
| author | bors <bors@rust-lang.org> | 2017-04-06 06:07:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-06 06:07:42 +0000 |
| commit | e5e92753cc3e12c3c468b6badaf340fe4443145c (patch) | |
| tree | ad85ffcb0203d3ff2468ce31afb4ef0cd03759f2 /src/libsyntax/ext | |
| parent | 1a9b382168cbf405589fbba7215ace700c067879 (diff) | |
| parent | 89b364d687b7a3d16fb9553f7b5b0c034c406d91 (diff) | |
Auto merge of #41102 - frewsxcv:rollup, r=frewsxcv
Rollup of 5 pull requests - Successful merges: #40908, #41011, #41026, #41037, #41050 - Failed merges:
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/derive.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsyntax/ext/derive.rs b/src/libsyntax/ext/derive.rs index c79040424f6..e7c5d8278d9 100644 --- a/src/libsyntax/ext/derive.rs +++ b/src/libsyntax/ext/derive.rs @@ -26,7 +26,8 @@ pub fn collect_derives(cx: &mut ExtCtxt, attrs: &mut Vec<ast::Attribute>) -> Vec return true; } - match attr.parse_list(cx.parse_sess, |parser| parser.parse_path(PathStyle::Mod)) { + match attr.parse_list(cx.parse_sess, + |parser| parser.parse_path_allowing_meta(PathStyle::Mod)) { Ok(ref traits) if traits.is_empty() => { cx.span_warn(attr.span, "empty trait list in `derive`"); false |