---

yaml
---
r: 23417
b: refs/heads/master
c: 77e83d8
h: refs/heads/master
i:
  23415: 48f7f8e
v: v3

Author: paulstansifer

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c74a442e86abf885b53dba8a1a33359c70f49e15
+refs/heads/master: 77e83d83a9a93188c3bb80ea2bb09f2e5fd2579f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/future.rs

@@ -134,11 +134,11 @@ fn with<A,B>(future: &Future<A>, blk: fn((&A)) -> B) -> B {
     blk(v)
 }
 
-proto! future_pipe {
+proto! future_pipe (
     waiting:recv<T:send> {
         completed(T) -> !
     }
-}
+)
 
 #[test]
 fn test_from_value() {

trunk/src/libcore/pipes.rs

@@ -7,14 +7,14 @@ directions they can flow at any given point are determined by a
 protocol. Below is an example protocol.
 
 ~~~
-proto! pingpong {
+proto! pingpong (
     ping: send {
         ping -> pong
     }
     pong: recv {
         pong -> ping
     }
-}
+)
 ~~~
 
 The `proto!` syntax extension will convert this into a module called
@@ -893,11 +893,11 @@ fn spawn_service_recv<T: send, Tb: send>(
 
 // Streams - Make pipes a little easier in general.
 
-proto! streamp {
+proto! streamp (
     open:send<T: send> {
         data(T) -> open<T>
     }
-}
+)
 
 /// A trait for things that can send multiple messages.
 trait channel<T: send> {
@@ -1138,11 +1138,11 @@ impl<T: send, U: send, Left: selectable recv<T>, Right: selectable recv<U>>
     }
 }
 
-proto! oneshot {
+proto! oneshot (
     oneshot:send<T:send> {
         send(T) -> !
     }
-}
+)
 
 /// The send end of a oneshot pipe.
 type chan_one<T: send> = oneshot::client::oneshot<T>;

trunk/src/libsyntax/ext/pipes.rs

@@ -3,14 +3,14 @@
 This is frequently called the pipe compiler. It handles code such as...
 
 ~~~
-proto! pingpong {
+proto! pingpong (
     ping: send {
         ping -> pong
     }
     pong: recv {
         pong -> ping
     }
-}
+)
 ~~~
 
 There are several components:

trunk/src/test/bench/msgsend-ring-pipes.rs

@@ -15,11 +15,11 @@ import std::time;
 
 import pipes::recv;
 
-proto! ring {
+proto! ring (
     num:send {
         num(uint) -> num
     }
-}
+)
 
 fn macros() {
     #macro[

trunk/src/test/bench/pingpong.rs

@@ -7,17 +7,17 @@ use std;
 import pipes::{spawn_service, recv};
 import std::time::precise_time_s;
 
-proto! pingpong {
+proto! pingpong (
     ping: send {
         ping -> pong
     }
 
     pong: recv {
         pong -> ping
     }
-}
+)
 
-proto! pingpong_unbounded {
+proto! pingpong_unbounded (
     ping: send {
         ping -> pong
     }
@@ -29,7 +29,7 @@ proto! pingpong_unbounded {
     you_will_never_catch_me: send {
         never_ever_ever -> you_will_never_catch_me
     }
-}
+)
 
 // This stuff should go in libcore::pipes
 macro_rules! move_it (

trunk/src/test/bench/task-perf-word-count-generic.rs

@@ -142,7 +142,7 @@ mod map_reduce {
     }
 
 
-    proto! ctrl_proto {
+    proto! ctrl_proto (
         open: send<K: copy send, V: copy send> {
             find_reducer(K) -> reducer_response<K, V>,
             mapper_done -> !
@@ -151,7 +151,7 @@ mod map_reduce {
         reducer_response: recv<K: copy send, V: copy send> {
             reducer(Chan<reduce_proto<V>>) -> open<K, V>
         }
-    }
+    )
 
     enum reduce_proto<V: copy send> { emit_val(V), done, addref, release }
 

trunk/src/test/run-pass/issue-2834.rs

@@ -2,11 +2,11 @@
 //
 // xfail-test
 
-proto! streamp {
+proto! streamp (
     open:send<T: send> {
         data(T) -> open<T>
     }
-}
+)
 
 fn rendezvous() {
     let (c, s) = streamp::init();

trunk/src/test/run-pass/issue-2930.rs

@@ -1,8 +1,8 @@
-proto! stream {
+proto! stream (
     stream:send<T:send> {
         send(T) -> stream<T>
     }
-}
+)
 
 fn main() {
     let (bc, _bp) = stream::init();

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

@@ -11,7 +11,7 @@ type password = ~str;
 type money = float;
 type amount = float;
 
-proto! bank {
+proto! bank (
     login:send {
         login(username, password) -> login_response
     }
@@ -30,7 +30,7 @@ proto! bank {
         money(money) -> connected,
         insufficient_funds -> connected
     }
-}
+)
 
 macro_rules! move_it (
     { $x:expr } => { unsafe { let y <- *ptr::addr_of($x); y } }

trunk/src/test/run-pass/pipe-detect-term.rs

@@ -9,11 +9,11 @@ import std::uv;
 
 import pipes::{try_recv, recv};
 
-proto! oneshot {
+proto! oneshot (
     waiting:send {
         signal -> !
     }
-}
+)
 
 fn main() {
     let iotask = uv::global_loop::get();

trunk/src/test/run-pass/pipe-peek.rs

@@ -4,11 +4,11 @@ use std;
 import std::timer::sleep;
 import std::uv;
 
-proto! oneshot {
+proto! oneshot (
     waiting:send {
         signal -> !
     }
-}
+)
 
 fn main() {
     let (c, p) = oneshot::init();

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

@@ -2,15 +2,15 @@
 
 // xfail-pretty
 
-proto! pingpong {
+proto! pingpong (
     ping:send {
         ping -> pong
     }
 
     pong:recv {
         pong -> ping
     }
-}
+)
 
 mod test {
     import pipes::recv;

trunk/src/test/run-pass/pipe-presentation-examples.rs

@@ -71,7 +71,7 @@ struct Buffer {
     drop { }
 }
 
-proto! double_buffer {
+proto! double_buffer (
     acquire:send {
         request -> wait_buffer
     }
@@ -83,7 +83,7 @@ proto! double_buffer {
     release:send {
         release(Buffer) -> acquire
     }
-}
+)
 
 // Code examples
 fn render(_buffer: &Buffer) {

trunk/src/test/run-pass/pipe-select-macro.rs

@@ -1,13 +1,13 @@
 // xfail-pretty
 
 // Protocols
-proto! foo {
+proto! foo (
     foo:recv {
         do_foo -> foo
     }
-}
+)
 
-proto! bar {
+proto! bar (
     bar:recv {
         do_bar(int) -> barbar,
         do_baz(bool) -> bazbar,
@@ -20,7 +20,7 @@ proto! bar {
     bazbar:send {
         rebazbar -> bar
     }
-}
+)
 
 fn macros() {
     include!("select-macro.rs");

trunk/src/test/run-pass/pipe-select.rs

@@ -7,17 +7,17 @@ import std::uv;
 
 import pipes::{recv, select};
 
-proto! oneshot {
+proto! oneshot (
     waiting:send {
         signal -> !
     }
-}
+)
 
-proto! stream {
+proto! stream (
     stream:send<T:send> {
         send(T) -> stream<T>
     }
-}
+)
 
 fn main() {
     import oneshot::client::*;

trunk/src/test/run-pass/pipe-sleep.rs

@@ -5,11 +5,11 @@ import std::timer::sleep;
 import std::uv;
 import pipes::recv;
 
-proto! oneshot {
+proto! oneshot (
     waiting:send {
         signal -> !
     }
-}
+)
 
 fn main() {
     import oneshot::client::*;