---

yaml
---
r: 31733
b: refs/heads/dist-snap
c: c5fbff0
h: refs/heads/master
i:
  31731: f4fd28c
v: v3

Author: eholk

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: bc6ba6b09174fdd1feaee1ce011572ba6eb1986a
+refs/heads/dist-snap: c5fbff01ce2b3e2d3020182891d4a22b8958f7f3
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -395,6 +395,20 @@ fn try_recv<T: send, Tbuffer: send>(-p: recv_packet_buffered<T, Tbuffer>)
 {
     let p_ = p.unwrap();
     let p = unsafe { &*p_ };
+
+    // optimistic path
+    match p.header.state {
+      full => {
+        let mut payload = none;
+        payload <-> p.payload;
+        p.header.state = empty;
+        return some(option::unwrap(payload))
+      },
+      terminated => return none,
+      _ => {}
+    }
+
+    // regular path
     let this = rustrt::rust_get_task();
     rustrt::task_clear_event_reject(this);
     rustrt::rust_task_ref(this);