Skip to content

Commit 82198c9

Browse files
committed
test: Fix broken test that used "move" as an identifier
1 parent b414db0 commit 82198c9

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ proto! bank {
3232
}
3333
}
3434

35-
macro_rules! move {
35+
macro_rules! move_it {
3636
{ $x:expr } => { unsafe { let y <- *ptr::addr_of($x); y } }
3737
}
3838

@@ -41,15 +41,15 @@ fn switch<T: send, U>(+endp: pipes::recv_packet<T>,
4141
f(pipes::try_recv(endp))
4242
}
4343

44-
fn move<T>(-x: T) -> T { x }
44+
fn move_it<T>(-x: T) -> T { x }
4545

4646
macro_rules! follow {
4747
{
4848
$($message:path($($x: ident),+) => $next:ident $e:expr)+
4949
} => (
50-
|m| alt move(m) {
50+
|m| alt move_it(m) {
5151
$(some($message($($x,)* next)) {
52-
let $next = move!{next};
52+
let $next = move_it!{next};
5353
$e })+
5454
_ { fail }
5555
}
@@ -58,9 +58,9 @@ macro_rules! follow {
5858
{
5959
$($message:path => $next:ident $e:expr)+
6060
} => (
61-
|m| alt move(m) {
61+
|m| alt move_it(m) {
6262
$(some($message(next)) {
63-
let $next = move!{next};
63+
let $next = move_it!{next};
6464
$e })+
6565
_ { fail }
6666
}
@@ -111,7 +111,7 @@ fn bank_client(+bank: bank::client::login) {
111111
let bank = client::login(bank, ~"theincredibleholk", ~"1234");
112112
let bank = alt try_recv(bank) {
113113
some(ok(connected)) {
114-
move!{connected}
114+
move_it!{connected}
115115
}
116116
some(invalid(_)) { fail ~"login unsuccessful" }
117117
none { fail ~"bank closed the connection" }
@@ -133,4 +133,4 @@ fn bank_client(+bank: bank::client::login) {
133133
}
134134

135135
fn main() {
136-
}
136+
}

0 commit comments

Comments
 (0)