auto merge of #9926 : Kimundi/rust/future_result_bad_sig, r=huonw

1 files changed, 0 insertions, 25 deletions

diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs
index d5278975d8d..889d9bb3156 100644
--- a/src/libstd/rt/task.rs
+++ b/src/libstd/rt/task.rs
@@ -621,29 +621,4 @@ mod test {
             a.next = Some(b);
         }
     }
-
-    // XXX: This is a copy of test_future_result in std::task.
-    // It can be removed once the scheduler is turned on by default.
-    #[test]
-    fn future_result() {
-        do run_in_newsched_task {
-            use option::{Some, None};
-            use task::*;
-
-            let mut result = None;
-            let mut builder = task();
-            builder.future_result(|r| result = Some(r));
-            do builder.spawn {}
-            assert_eq!(result.unwrap().recv(), Success);
-
-            result = None;
-            let mut builder = task();
-            builder.future_result(|r| result = Some(r));
-            builder.unlinked();
-            do builder.spawn {
-                fail2!();
-            }
-            assert_eq!(result.unwrap().recv(), Failure);
-        }
-    }
 }