Skip to content

Commit b62844e

Browse files
committed
core: peek returns false for terminated pipes. Closes #3905
1 parent a90020f commit b62844e

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

src/libcore/pipes.rs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,9 +511,9 @@ pub fn try_recv<T: Send, Tbuffer: Send>(p: RecvPacketBuffered<T, Tbuffer>)
511511
/// Returns true if messages are available.
512512
pub pure fn peek<T: Send, Tb: Send>(p: &RecvPacketBuffered<T, Tb>) -> bool {
513513
match unsafe {(*p.header()).state} {
514-
Empty => false,
514+
Empty | Terminated => false,
515515
Blocked => fail ~"peeking on blocked packet",
516-
Full | Terminated => true
516+
Full => true
517517
}
518518
}
519519

@@ -1234,4 +1234,16 @@ pub mod test {
12341234

12351235
recv_one(move p)
12361236
}
1237+
1238+
#[test]
1239+
fn test_peek_terminated() {
1240+
let (chan, port): (Chan<int>, Port<int>) = stream();
1241+
1242+
{
1243+
// Destroy the channel
1244+
let _chan = move chan;
1245+
}
1246+
1247+
assert !port.peek();
1248+
}
12371249
}

0 commit comments

Comments
 (0)