From d2496a45c3151a789fea6f46a6dcd3b9f58d382e Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Wed, 3 Jun 2015 07:14:53 +0530
Subject: [PATCH] fix rebase issues

---
 components/plugins/heap_size.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/plugins/heap_size.rs b/components/plugins/heap_size.rs
index 956888fc712..7e4c508a8aa 100644
--- a/components/plugins/heap_size.rs
+++ b/components/plugins/heap_size.rs
@@ -22,7 +22,7 @@ use syntax::ext::build::AstBuilder;
 use syntax::ext::deriving::generic::*;
 
 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 {
         span: span,
         attributes: Vec::new(),
@@ -43,7 +43,7 @@ pub fn expand_heap_size(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem,
         ],
         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.