mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #37034 - nox:empty-trait-list, r=alexcrichton

Browse Source 
Do not add an empty #[derive()] list in expand_derive (fixes #37033)
This commit is contained in:
Manish Goregaokar 2016-10-08 16:52:44 +05:30 committed by GitHub
commit 69f4126da5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libsyntax_ext/deriving/mod.rs
View File

@ -154,11 +154,13 @@ pub fn expand_derive(cx: &mut ExtCtxt,
});
if new_attributes.len() > 0 {
item = item.map(|mut i| {
let list = cx.meta_list(mitem.span,
intern_and_get_ident("derive"),
traits);
i.attrs.extend(new_attributes);
i.attrs.push(cx.attribute(mitem.span, list));
if traits.len() > 0 {
let list = cx.meta_list(mitem.span,
intern_and_get_ident("derive"),
traits);
i.attrs.push(cx.attribute(mitem.span, list));
}
i
});
return vec![Annotatable::Item(item)]