From dd406365e1a189c4f229e1eba7ba091605e995ef Mon Sep 17 00:00:00 2001
From: Ben Blum <bblum@andrew.cmu.edu>
Date: Thu, 8 Aug 2013 19:59:08 -0400
Subject: Add assert_once_ever macro. Close #7748. (fixme cf #8472)

---
 src/libstd/rt/mod.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/libstd/rt')

diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs
index db1bfdf1bf5..8b3e65b57ab 100644
--- a/src/libstd/rt/mod.rs
+++ b/src/libstd/rt/mod.rs
@@ -323,6 +323,7 @@ fn run_(main: ~fn(), use_main_sched: bool) -> int {
     // task tree, shut down the schedulers and set the exit code.
     let handles = Cell::new(handles);
     let on_exit: ~fn(bool) = |exit_success| {
+        assert_once_ever!("last task exiting");
 
         let mut handles = handles.take();
         for handle in handles.mut_iter() {
-- 
cgit 1.4.1-3-g733a5


From 598072afa46d3c4fca7659c49ef3c9dc9f85787e Mon Sep 17 00:00:00 2001
From: Ben Blum <bblum@andrew.cmu.edu>
Date: Wed, 21 Aug 2013 18:43:50 -0400
Subject: Don't fail in port.try_recv() the second time. Close #7800.

---
 src/libstd/cell.rs    |  6 ++++++
 src/libstd/rt/comm.rs | 13 +++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/libstd/rt')

diff --git a/src/libstd/cell.rs b/src/libstd/cell.rs
index 372effad61d..a3d06378ed4 100644
--- a/src/libstd/cell.rs
+++ b/src/libstd/cell.rs
@@ -50,6 +50,12 @@ impl<T> Cell<T> {
         this.value.take_unwrap()
     }
 
+    /// Yields the value if the cell is full, or `None` if it is empty.
+    pub fn take_opt(&self) -> Option<T> {
+        let this = unsafe { transmute_mut(self) };
+        this.value.take()
+    }
+
     /// Returns the value, failing if the cell is full.
     pub fn put_back(&self, value: T) {
         let this = unsafe { transmute_mut(self) };
diff --git a/src/libstd/rt/comm.rs b/src/libstd/rt/comm.rs
index 49cf8c239b7..c6b87d88979 100644
--- a/src/libstd/rt/comm.rs
+++ b/src/libstd/rt/comm.rs
@@ -499,13 +499,14 @@ impl<T> GenericPort<T> for Port<T> {
     }
 
     fn try_recv(&self) -> Option<T> {
-        let pone = self.next.take();
-        match pone.try_recv() {
-            Some(StreamPayload { val, next }) => {
-                self.next.put_back(next);
-                Some(val)
+        do self.next.take_opt().map_move_default(None) |pone| {
+            match pone.try_recv() {
+                Some(StreamPayload { val, next }) => {
+                    self.next.put_back(next);
+                    Some(val)
+                }
+                None => None
             }
-            None => None
         }
     }
 }
-- 
cgit 1.4.1-3-g733a5