---

yaml
---
r: 40272
b: refs/heads/dist-snap
c: b62844e
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: a90020fe8dd8be8615df82e6294408bfed82a767
+refs/heads/dist-snap: b62844e755d36fddff303c0639303bb0f56c5d41
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libcore/pipes.rs

@@ -511,9 +511,9 @@ pub fn try_recv<T: Send, Tbuffer: Send>(p: RecvPacketBuffered<T, Tbuffer>)
 /// Returns true if messages are available.
 pub pure fn peek<T: Send, Tb: Send>(p: &RecvPacketBuffered<T, Tb>) -> bool {
     match unsafe {(*p.header()).state} {
-      Empty => false,
+      Empty | Terminated => false,
       Blocked => fail ~"peeking on blocked packet",
-      Full | Terminated => true
+      Full => true
     }
 }
 
@@ -1234,4 +1234,16 @@ pub mod test {
 
         recv_one(move p)
     }
+
+    #[test]
+    fn test_peek_terminated() {
+        let (chan, port): (Chan<int>, Port<int>) = stream();
+
+        {
+            // Destroy the channel
+            let _chan = move chan;
+        }
+
+        assert !port.peek();
+    }
 }