From bede54b14acb093e86a936d5ba62ff2af8b558d5 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Sat, 2 Jun 2012 20:48:53 -0700
Subject: misc. copies in core/syntax to please borrowck

---
 src/libcore/future.rs | 2 +-
 src/libcore/io.rs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libcore')

diff --git a/src/libcore/future.rs b/src/libcore/future.rs
index e0321b45287..6152b83536a 100644
--- a/src/libcore/future.rs
+++ b/src/libcore/future.rs
@@ -108,7 +108,7 @@ fn get<A:copy>(future: future<A>) -> A {
 fn with<A,B>(future: future<A>, blk: fn(A) -> B) -> B {
     #[doc = "Work with the value without copying it"];
 
-    let v = alt future.v {
+    let v = alt copy future.v {
       either::left(v) { v }
       either::right(f) {
         let v = @f();
diff --git a/src/libcore/io.rs b/src/libcore/io.rs
index 02371ea7625..b18be417019 100644
--- a/src/libcore/io.rs
+++ b/src/libcore/io.rs
@@ -613,7 +613,7 @@ impl of writer for mem_buffer {
         // FIXME #2004--use memcpy here?
         let mut pos = self.pos, vpos = 0u;
         while vpos < vlen && pos < buf_len {
-            self.buf.set_elt(pos, v[vpos]);
+            self.buf.set_elt(pos, copy v[vpos]);
             pos += 1u;
             vpos += 1u;
         }
-- 
cgit 1.4.1-3-g733a5