---

yaml
---
r: 30004
b: refs/heads/incoming
c: fe25667
h: refs/heads/master
v: v3

Author: bblum

[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: 20773f33f522ac7686e0ac7271332646e9944938
+refs/heads/incoming: fe2566777dae60b21fbea9173e6f31881da78ffb
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/pipes.rs

@@ -666,12 +666,10 @@ fn select2<A: send, Ab: send, B: send, Bb: send>(
 {
     let i = wait_many([a.header(), b.header()]/_);
 
-    unsafe {
-        match i {
-          0 => Left((try_recv(a), b)),
-          1 => Right((a, try_recv(b))),
-          _ => fail ~"select2 return an invalid packet"
-        }
+    match i {
+      0 => Left((try_recv(a), b)),
+      1 => Right((a, try_recv(b))),
+      _ => fail ~"select2 return an invalid packet"
     }
 }
 
@@ -706,17 +704,9 @@ fn select<T: send, Tb: send>(+endpoints: ~[recv_packet_buffered<T, Tb>])
     -> (uint, option<T>, ~[recv_packet_buffered<T, Tb>])
 {
     let ready = wait_many(endpoints.map(|p| p.header()));
-    let mut remaining = ~[];
-    let mut result = none;
-    do vec::consume(endpoints) |i, p| {
-        if i == ready {
-            result = try_recv(p);
-        }
-        else {
-            vec::push(remaining, p);
-        }
-    }
-
+    let mut remaining = endpoints;
+    let port = vec::swap_remove(remaining, ready);
+    let result = try_recv(port);
     (ready, result, remaining)
 }
 
@@ -1054,12 +1044,7 @@ struct PortSet<T: send> : recv<T> {
                 }
                 none => {
                     // Remove this port.
-                    let mut ports_ = ~[];
-                    ports <-> ports_;
-                    vec::consume(ports_,
-                                 |j, x| if i != j {
-                                     vec::push(ports, x)
-                                 });
+                    let _ = vec::swap_remove(ports, i);
                 }
             }
         }

branches/incoming/src/libcore/vec.rs

@@ -36,6 +36,7 @@ export rsplitn;
 export shift;
 export unshift;
 export pop;
+export swap_remove;
 export push, push_all, push_all_move;
 export grow;
 export grow_fn;