libsyntax Eagerly clone some data to accommodate by-value closures.

Author: pcwalton

src/libsyntax/ext/deriving/cmp/totalord.rs

@@ -67,6 +67,7 @@ pub fn cs_cmp(cx: &mut ExtCtxt, span: Span,
               substr: &Substructure) -> @Expr {
     let test_id = cx.ident_of("__test");
     let equals_path = ordering_const(cx, span, Equal);
+    let equals_path_2 = equals_path.clone();
 
     /*
     Builds:
@@ -107,7 +108,7 @@ pub fn cs_cmp(cx: &mut ExtCtxt, span: Span,
                                  old, Some(cx.expr_ident(span, test_id)));
             cx.expr_block(cx.block(span, vec!(assign), Some(if_)))
         },
-        cx.expr_path(equals_path.clone()),
+        cx.expr_path(equals_path_2),
         |cx, span, list, _| {
             match list {
                 // an earlier nonmatching variant is Less than a

src/libsyntax/ext/deriving/generic/mod.rs

@@ -380,6 +380,7 @@ impl<'a> TraitDef<'a> {
                            generics: &Generics,
                            methods: Vec<@ast::Method> ) -> @ast::Item {
         let trait_path = self.path.to_path(cx, self.span, type_ident, generics);
+        let trait_path_2 = trait_path.clone();
 
         let Generics { mut lifetimes, ty_params } =
             self.generics.to_generics(cx, self.span, type_ident, generics);
@@ -399,7 +400,7 @@ impl<'a> TraitDef<'a> {
                                                   type_ident, generics))
                 }).collect();
             // require the current trait
-            bounds.push(cx.typarambound(trait_path.clone()));
+            bounds.push(cx.typarambound(trait_path_2.clone()));
 
             cx.typaram(self.span,
                        ty_param.ident,