---

yaml
---
r: 22566
b: refs/heads/master
c: 436d263
h: refs/heads/master
v: v3

Author: eholk

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0487663e7d9d7b542a66299dee64204f8c96689c
+refs/heads/master: 436d263aed2ef54cdcec84ecb9c99a71b487769e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/pipes.rs

@@ -318,10 +318,22 @@ fn select2<A: send, B: send>(
     }
 }
 
-fn selecti<T: send>(endpoints: &[&recv_packet<T>]) -> uint {
+trait selectable {
+    pure fn header() -> *packet_header;
+}
+
+fn selecti<T: selectable>(endpoints: &[T]) -> uint {
     wait_many(endpoints.map(|p| p.header()))
 }
 
+fn select2i<A: selectable, B: selectable>(a: A, b: B) -> either<(), ()> {
+    alt wait_many([a.header(), b.header()]/_) {
+      0 { left(()) }
+      1 { right(()) }
+      _ { fail "wait returned unexpected index" }
+    }
+}
+
 #[doc = "Waits on a set of endpoints. Returns a message, its index,
  and a list of the remaining endpoints."]
 fn select<T: send>(+endpoints: ~[recv_packet<T>])
@@ -552,7 +564,7 @@ class port_set<T: send> {
     }
 }
 
-impl private_methods/&<T: send> for pipes::port<T> {
+impl<T: send> of selectable for pipes::port<T> {
     pure fn header() -> *pipes::packet_header unchecked {
         alt self.endp {
           some(endp) {