From 9c034464fee35d526369c4eccb8ac32244c52411 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Tue, 14 Aug 2012 04:36:52 +0000
Subject: [PATCH] fix fallout from future de-mode-ing.

---
 src/test/run-pass/task-comm-12.rs | 2 +-
 src/test/run-pass/task-comm-3.rs  | 2 +-
 src/test/run-pass/task-comm-9.rs  | 2 +-
 src/test/run-pass/task-comm.rs    | 4 ++--
 src/test/run-pass/yield.rs        | 2 +-
 src/test/run-pass/yield1.rs       | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/test/run-pass/task-comm-12.rs b/src/test/run-pass/task-comm-12.rs
index 20d1ad57bc12..9aa68813955b 100644
--- a/src/test/run-pass/task-comm-12.rs
+++ b/src/test/run-pass/task-comm-12.rs
@@ -20,7 +20,7 @@ fn test00() {
     }
 
     // Try joining tasks that have already finished.
-    future::get(option::unwrap(result));
+    future::get(&option::unwrap(result));
 
     debug!{"Joined task."};
 }
diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs
index 44bd01076841..a4296df86180 100644
--- a/src/test/run-pass/task-comm-3.rs
+++ b/src/test/run-pass/task-comm-3.rs
@@ -52,7 +52,7 @@ fn test00() {
     }
 
     // Join spawned tasks...
-    for results.each |r| { future::get(r); }
+    for results.each |r| { future::get(&r); }
 
     debug!{"Completed: Final number is: "};
     log(error, sum);
diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/run-pass/task-comm-9.rs
index 65977d7997d7..fe0eea346428 100644
--- a/src/test/run-pass/task-comm-9.rs
+++ b/src/test/run-pass/task-comm-9.rs
@@ -27,7 +27,7 @@ fn test00() {
         i += 1;
     }
 
-    future::get(option::unwrap(result));
+    future::get(&option::unwrap(result));
 
     assert (sum == number_of_messages * (number_of_messages - 1) / 2);
 }
diff --git a/src/test/run-pass/task-comm.rs b/src/test/run-pass/task-comm.rs
index 3ca0421c2351..892d12733b57 100644
--- a/src/test/run-pass/task-comm.rs
+++ b/src/test/run-pass/task-comm.rs
@@ -53,7 +53,7 @@ fn test00() {
         while i < number_of_messages { sum += recv(po); i = i + 1; }
     }
 
-    for results.each |r| { future::get(r); }
+    for results.each |r| { future::get(&r); }
 
     debug!{"Completed: Final number is: "};
     assert (sum ==
@@ -136,7 +136,7 @@ fn test06() {
     }
 
 
-    for results.each |r| { future::get(r); }
+    for results.each |r| { future::get(&r); }
 }
 
 
diff --git a/src/test/run-pass/yield.rs b/src/test/run-pass/yield.rs
index 9a5b72f97085..eb6a501e70d2 100644
--- a/src/test/run-pass/yield.rs
+++ b/src/test/run-pass/yield.rs
@@ -11,7 +11,7 @@ fn main() {
     error!{"2"};
     yield();
     error!{"3"};
-    future::get(option::unwrap(result));
+    future::get(&option::unwrap(result));
 }
 
 fn child() {
diff --git a/src/test/run-pass/yield1.rs b/src/test/run-pass/yield1.rs
index c2bc3bfbc1f7..be29ca49307e 100644
--- a/src/test/run-pass/yield1.rs
+++ b/src/test/run-pass/yield1.rs
@@ -8,7 +8,7 @@ fn main() {
     task::task().future_result(|+r| { result = some(r); }).spawn(child);
     error!{"1"};
     yield();
-    future::get(option::unwrap(result));
+    future::get(&option::unwrap(result));
 }
 
 fn child() { error!{"2"}; }