---

yaml
---
r: 22887
b: refs/heads/master
c: 82198c9
h: refs/heads/master
i:
  22885: ce091ea
  22883: 69e57f2
  22879: a82b0d4
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b414db041be115d877e5b17bc86ea019420b672c
+refs/heads/master: 82198c9925a8f5da2a8218dc875bc802e7db6049
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/test/run-pass/pipe-bank-proto.rs

@@ -32,7 +32,7 @@ proto! bank {
     }
 }
 
-macro_rules! move {
+macro_rules! move_it {
     { $x:expr } => { unsafe { let y <- *ptr::addr_of($x); y } }
 }
 
@@ -41,15 +41,15 @@ fn switch<T: send, U>(+endp: pipes::recv_packet<T>,
     f(pipes::try_recv(endp))
 }
 
-fn move<T>(-x: T) -> T { x }
+fn move_it<T>(-x: T) -> T { x }
 
 macro_rules! follow {
     { 
         $($message:path($($x: ident),+) => $next:ident $e:expr)+
     } => (
-        |m| alt move(m) {
+        |m| alt move_it(m) {
           $(some($message($($x,)* next)) {
-            let $next = move!{next};
+            let $next = move_it!{next};
             $e })+
           _ { fail }
         }
@@ -58,9 +58,9 @@ macro_rules! follow {
     { 
         $($message:path => $next:ident $e:expr)+
     } => (
-        |m| alt move(m) {
+        |m| alt move_it(m) {
             $(some($message(next)) {
-                let $next = move!{next};
+                let $next = move_it!{next};
                 $e })+
                 _ { fail }
         } 
@@ -111,7 +111,7 @@ fn bank_client(+bank: bank::client::login) {
     let bank = client::login(bank, ~"theincredibleholk", ~"1234");
     let bank = alt try_recv(bank) {
       some(ok(connected)) {
-        move!{connected}
+        move_it!{connected}
       }
       some(invalid(_)) { fail ~"login unsuccessful" }
       none { fail ~"bank closed the connection" }
@@ -133,4 +133,4 @@ fn bank_client(+bank: bank::client::login) {
 }
 
 fn main() {
-}
+}