---

yaml
---
r: 90363
b: refs/heads/master
c: 6113508
h: refs/heads/master
i:
  90361: 67f654f
  90359: 64deff7
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 89e1db3d6ce37946afd7115dfcce510261537a85
+refs/heads/master: 61135080554d35cca151614c93693cb524fdffe0
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/src/libstd/rt/deque.rs

@@ -163,10 +163,9 @@ impl<T: Send> BufferPool<T> {
 
     fn free(&mut self, buf: ~Buffer<T>) {
         unsafe {
-            use cell::Cell;
-            let buf = Cell::new(buf);
+            let mut buf = Some(buf);
             self.pool.with(|pool| {
-                let buf = buf.take();
+                let buf = buf.take_unwrap();
                 match pool.iter().position(|v| v.size() > buf.size()) {
                     Some(i) => pool.insert(i, buf),
                     None => pool.push(buf),

trunk/src/libstd/rt/task.rs

@@ -19,7 +19,6 @@ use prelude::*;
 
 use borrow;
 use cast::transmute;
-use cell::Cell;
 use cleanup;
 use libc::{c_void, uintptr_t, c_char, size_t};
 use local_data;
@@ -427,7 +426,6 @@ impl Coroutine {
     }
 
     fn build_start_wrapper(start: proc()) -> proc() {
-        let start_cell = Cell::new(start);
         let wrapper: proc() = proc() {
             // First code after swap to this new context. Run our
             // cleanup job.
@@ -446,6 +444,7 @@ impl Coroutine {
                 // need to unsafe_borrow.
                 let task: *mut Task = Local::unsafe_borrow();
 
+                let mut start_cell = Some(start);
                 (*task).run(|| {
                     // N.B. Removing `start` from the start wrapper
                     // closure by emptying a cell is critical for
@@ -457,7 +456,7 @@ impl Coroutine {
                     // be in task context. By moving `start` out of
                     // the closure, all the user code goes our of
                     // scope while the task is still running.
-                    let start = start_cell.take();
+                    let start = start_cell.take_unwrap();
                     start();
                 });
             }