fix rebase issues

This commit is contained in:
Manish Goregaokar 2015-06-03 07:14:53 +05:30
parent 7bc88d541f
commit d2496a45c3

View file

@ -22,7 +22,7 @@ use syntax::ext::build::AstBuilder;
use syntax::ext::deriving::generic::*; use syntax::ext::deriving::generic::*;
pub fn expand_heap_size(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem, pub fn expand_heap_size(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem,
item: Annotatable, push: &mut FnMut(Annotatable)) { item: &Annotatable, push: &mut FnMut(Annotatable)) {
let trait_def = TraitDef { let trait_def = TraitDef {
span: span, span: span,
attributes: Vec::new(), attributes: Vec::new(),
@ -43,7 +43,7 @@ pub fn expand_heap_size(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem,
], ],
associated_types: vec![], associated_types: vec![],
}; };
trait_def.expand(cx, mitem, &item, push) trait_def.expand(cx, mitem, item, push)
} }
/// Defines how the implementation for `heap_size_of_children()` is to be generated. /// Defines how the implementation for `heap_size_of_children()` is to be generated.