From 96445a533e8ea40701e2a9bbd25347141e63c115 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sun, 19 Oct 2014 13:00:32 -0700
Subject: Test fixes and rebase conflicts

---
 src/libnative/task.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libnative/task.rs')

diff --git a/src/libnative/task.rs b/src/libnative/task.rs
index 48e2c440dfc..d90535428da 100644
--- a/src/libnative/task.rs
+++ b/src/libnative/task.rs
@@ -345,7 +345,7 @@ mod tests {
     #[test]
     fn spawn_inherits() {
         let (tx, rx) = channel();
-        spawn(proc() {
+        TaskBuilder::new().spawner(NativeSpawner).spawn(proc() {
             spawn(proc() {
                 let mut task: Box<Task> = Local::take();
                 match task.maybe_take_runtime::<Ops>() {
-- 
cgit 1.4.1-3-g733a5