---

yaml
---
r: 23005
b: refs/heads/master
c: c973732
h: refs/heads/master
i:
  23003: 1ce320c
v: v3

Author: eholk

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 517ad983f9f5ac7f805dd15cf6c6a156e02e3ec8
+refs/heads/master: c973732a23da75b09dd6d35ce6f951c8bcd6cb01
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/test/bench/pingpong.rs

@@ -1,6 +1,5 @@
 // Compare bounded and unbounded protocol performance.
 
-// xfail-test
 // xfail-pretty
 
 use std;
@@ -33,31 +32,35 @@ proto! pingpong_unbounded {
 }
 
 // This stuff should go in libcore::pipes
-macro_rules! move {
-    { $x:expr } => { unsafe { let y <- *ptr::addr_of($x); y } }
+macro_rules! move_it {
+    { $x:expr } => { let t <- *ptr::addr_of($x); t }
 }
 
 macro_rules! follow {
     { 
         $($message:path($($x: ident),+) -> $next:ident $e:expr)+
     } => (
-        |m| alt move(m) {
-          $(some($message($($x,)* next)) {
-            let $next = move!{next};
-            $e })+
-          _ { fail }
+        |m| alt move m {
+            $(some($message($($x,)* next)) => {
+                // FIXME (#2329) use regular move here once move out of
+                // enums is supported.
+                let $next = unsafe { move_it!(next) };
+                $e })+
+                _ => { fail }
         }
     );
 
     { 
         $($message:path -> $next:ident $e:expr)+
     } => (
-        |m| alt move(m) {
-            $(some($message(next)) {
-                let $next = move!{next};
+        |m| alt move m {
+            $(some($message(next)) => {
+                // FIXME (#2329) use regular move here once move out of
+                // enums is supported.
+                let $next = unsafe { move_it!(next) };
                 $e })+
-                _ { fail }
-        } 
+                _ => { fail }
+        }
     )
 }
 
@@ -66,8 +69,6 @@ fn switch<T: send, Tb: send, U>(+endp: pipes::recv_packet_buffered<T, Tb>,
     f(pipes::try_recv(endp))
 }
 
-fn move<T>(-x: T) -> T { x }
-
 // Here's the benchmark
 
 fn bounded(count: uint) {
@@ -132,7 +133,11 @@ fn timeit(f: fn()) -> float {
 }
 
 fn main() {
-    let count = 1000000;
+    let count = if os::getenv(~"RUST_BENCH").is_some() {
+        250000
+    } else {
+        100
+    };
     let bounded = do timeit { bounded(count) };
     let unbounded = do timeit { unbounded(count) };