---

yaml
---
r: 29886
b: refs/heads/incoming
c: b245289
h: refs/heads/master
v: v3

Author: eholk

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 942649a26073bb84797f8831d39d0b35018e931b
+refs/heads/incoming: b2452896d195ce2e8409244e177e04c55cf8a75c
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/pipes.rs

@@ -1043,10 +1043,14 @@ struct port_set<T: send> : recv<T> {
         let mut ports = ~[];
         ports <-> self.ports;
         while result == none && ports.len() > 0 {
-            let i = wait_many(ports.map(|p| p.header()));
+            let i = wait_many(ports);
             match move ports[i].try_recv() {
-                some(copy m) => {
-                    result = some(move m);
+                // FIXME (#2329): use this version once move from enum works.
+                //some(copy m) => {
+                //  result = some(move m);
+                //}
+                some(m) => {
+                  result = some(move_it!(m));
                 }
                 none => {
                     // Remove this port.
@@ -1065,7 +1069,9 @@ struct port_set<T: send> : recv<T> {
 
     fn recv() -> T {
         match move self.try_recv() {
-            some(copy x) => move x,
+            // FIXME (#2329): use this version once move from enum works.
+            //some(copy x) => move x,
+            some(x) => move_it!(x),
             none => fail ~"port_set: endpoints closed"
         }
     }