From 276b8b125d3f60cebab702542b60207429fbb333 Mon Sep 17 00:00:00 2001
From: Aaron Turon <aturon@mozilla.com>
Date: Mon, 18 Aug 2014 17:52:38 -0700
Subject: Fallout from stabilizing core::option

---
 src/libnative/io/timer_unix.rs | 2 +-
 src/libnative/lib.rs           | 2 +-
 src/libnative/task.rs          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/libnative')

diff --git a/src/libnative/io/timer_unix.rs b/src/libnative/io/timer_unix.rs
index 06d48f2f886..06b78a54e53 100644
--- a/src/libnative/io/timer_unix.rs
+++ b/src/libnative/io/timer_unix.rs
@@ -119,7 +119,7 @@ fn helper(input: libc::c_int, messages: Receiver<Req>, _: ()) {
         let mut timer = match active.shift() {
             Some(timer) => timer, None => return
         };
-        let mut cb = timer.cb.take_unwrap();
+        let mut cb = timer.cb.take().unwrap();
         cb.call();
         if timer.repeat {
             timer.cb = Some(cb);
diff --git a/src/libnative/lib.rs b/src/libnative/lib.rs
index c7b89b6cb91..06f89d38ca0 100644
--- a/src/libnative/lib.rs
+++ b/src/libnative/lib.rs
@@ -139,7 +139,7 @@ pub fn start(argc: int, argv: *const *const u8, main: proc()) -> int {
         unsafe {
             rt::stack::record_os_managed_stack_bounds(my_stack_bottom, my_stack_top);
         }
-        exit_code = Some(run(main.take_unwrap()));
+        exit_code = Some(run(main.take().unwrap()));
     }).destroy());
     unsafe { rt::cleanup(); }
     // If the exit code wasn't set, then the task block must have failed.
diff --git a/src/libnative/task.rs b/src/libnative/task.rs
index 55806caaf13..3109fd84581 100644
--- a/src/libnative/task.rs
+++ b/src/libnative/task.rs
@@ -92,7 +92,7 @@ pub fn spawn_opts(opts: TaskOpts, f: proc():Send) {
         let mut f = Some(f);
         let mut task = task;
         task.put_runtime(ops);
-        drop(task.run(|| { f.take_unwrap()() }).destroy());
+        drop(task.run(|| { f.take().unwrap()() }).destroy());
         drop(token);
     })
 }
-- 
cgit 1.4.1-3-g733a5