---

yaml
---
r: 23416
b: refs/heads/master
c: c74a442
h: refs/heads/master
v: v3

Author: paulstansifer

[refs]

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

trunk/src/libcore/future.rs

@@ -65,7 +65,7 @@ fn from_value<A>(+val: A) -> Future<A> {
 }
 
 macro_rules! move_it (
-    {$x:expr} => { unsafe { let y <- *ptr::addr_of($x); y } }
+    ($x:expr) => { unsafe { let y <- *ptr::addr_of($x); y } }
 )
 
 fn from_port<A:send>(+port: future_pipe::client::waiting<A>) -> Future<A> {

trunk/src/libcore/task.rs

@@ -1033,7 +1033,7 @@ fn kill_taskgroup(state: TaskGroupInner, me: *rust_task, is_main: bool) {
 // a proper closure because the #[test]s won't understand. Have to fake it.
 macro_rules! taskgroup_key (
     // Use a "code pointer" value that will never be a real code pointer.
-    {} => (unsafe::transmute((-2 as uint, 0u)))
+    () => (unsafe::transmute((-2 as uint, 0u)))
 )
 
 fn gen_child_taskgroup(linked: bool, supervised: bool)

trunk/src/libsyntax/parse/parser.rs

@@ -127,7 +127,7 @@ enum view_item_parse_mode {
 The important thing is to make sure that lookahead doesn't balk
 at INTERPOLATED tokens */
 macro_rules! maybe_whole_expr (
-    {$p:expr} => { match copy $p.token {
+    ($p:expr) => { match copy $p.token {
       INTERPOLATED(token::nt_expr(e)) => {
         $p.bump();
         return pexpr(e);
@@ -142,26 +142,26 @@ macro_rules! maybe_whole_expr (
 )
 
 macro_rules! maybe_whole (
-    {$p:expr, $constructor:ident} => { match copy $p.token {
+    ($p:expr, $constructor:ident) => { match copy $p.token {
       INTERPOLATED(token::$constructor(x)) => { $p.bump(); return x; }
       _ => ()
     }} ;
-    {deref $p:expr, $constructor:ident} => { match copy $p.token {
+    (deref $p:expr, $constructor:ident) => { match copy $p.token {
       INTERPOLATED(token::$constructor(x)) => { $p.bump(); return *x; }
       _ => ()
     }} ;
-    {some $p:expr, $constructor:ident} => { match copy $p.token {
+    (some $p:expr, $constructor:ident) => { match copy $p.token {
       INTERPOLATED(token::$constructor(x)) => { $p.bump(); return some(x); }
       _ => ()
     }} ;
-    {iovi $p:expr, $constructor:ident} => { match copy $p.token {
+    (iovi $p:expr, $constructor:ident) => { match copy $p.token {
       INTERPOLATED(token::$constructor(x)) => {
         $p.bump();
         return iovi_item(x);
       }
       _ => ()
     }} ;
-    {pair_empty $p:expr, $constructor:ident} => { match copy $p.token {
+    (pair_empty $p:expr, $constructor:ident) => { match copy $p.token {
       INTERPOLATED(token::$constructor(x)) => { $p.bump(); return (~[], x); }
       _ => ()
     }}

trunk/src/test/run-pass/html-literals.rs

@@ -16,62 +16,62 @@ left.
 */
 
 macro_rules! html (
-    { $($body:tt)* } => (
+    ( $($body:tt)* ) => (
         parse_node!( []; []; $($body)* )
     )
 )
 
 macro_rules! parse_node (
-    {
+    (
         [:$head:ident ($(:$head_nodes:expr),*)
          $(:$tags:ident ($(:$tag_nodes:expr),*))*];
         [$(:$nodes:expr),*];
         </$tag:ident> $($rest:tt)*
-    } => (
+    ) => (
         parse_node!(
             [$(: $tags ($(:$tag_nodes),*))*];
             [$(:$head_nodes,)* :tag(stringify!($head), ~[$($nodes),*])];
             $($rest)*
         )
     );
 
-    {
+    (
         [$(:$tags:ident ($(:$tag_nodes:expr),*) )*];
         [$(:$nodes:expr),*];
         <$tag:ident> $($rest:tt)*
-    } => (
+    ) => (
         parse_node!(
             [:$tag ($(:$nodes)*) $(: $tags ($(:$tag_nodes),*) )*];
             [];
             $($rest)*
         )
     );
 
-    {
+    (
         [$(:$tags:ident ($(:$tag_nodes:expr),*) )*];
         [$(:$nodes:expr),*];
         . $($rest:tt)*
-    } => (
+    ) => (
         parse_node!(
             [$(: $tags ($(:$tag_nodes),*))*];
             [$(:$nodes,)* :text(~".")];
             $($rest)*
         )
     );
 
-    {
+    (
         [$(:$tags:ident ($(:$tag_nodes:expr),*) )*];
         [$(:$nodes:expr),*];
         $word:ident $($rest:tt)*
-    } => (
+    ) => (
         parse_node!(
             [$(: $tags ($(:$tag_nodes),*))*];
             [$(:$nodes,)* :text(stringify!($word))];
             $($rest)*
         )
     );
 
-    { []; [:$e:expr]; } => ( $e );
+    ( []; [:$e:expr]; ) => ( $e );
 )
 
 fn main() {

trunk/src/test/run-pass/macro-2.rs

@@ -10,7 +10,7 @@ fn main() {
     assert (mylambda!(y, y * 2)(8) == 16);
 
     macro_rules! mylambda_tt(
-        {$x:ident, $body:expr} => {
+        ($x:ident, $body:expr) => {
             fn f($x: int) -> int { return $body; };
             f
         }

trunk/src/test/run-pass/macro-3.rs

@@ -6,7 +6,7 @@ fn main() {
     assert (trivial!() == 16);
 
     macro_rules! trivial_tt(
-        {} => {1*2*4*2*1}
+        () => {1*2*4*2*1}
     )
     assert(trivial_tt!() == 16);
 }

trunk/src/test/run-pass/macro-by-example-1.rs

@@ -3,7 +3,7 @@ fn main() {
     #macro[[#apply[f, [x, ...]], f(x, ...)]];
 
     macro_rules! apply_tt(
-        {$f:expr, ($($x:expr),*)} => {$f($($x),*)}
+        ($f:expr, ($($x:expr),*)) => {$f($($x),*)}
     )
 
     fn add(a: int, b: int) -> int { return a + b; }

trunk/src/test/run-pass/macro-interpolation.rs

@@ -1,6 +1,6 @@
 
 macro_rules! overly_complicated (
-    {$fnname:ident, $arg:ident, $ty:ty, $body:block, $val:expr, $pat:pat, $res:path} =>
+    ($fnname:ident, $arg:ident, $ty:ty, $body:block, $val:expr, $pat:pat, $res:path) =>
     {
         fn $fnname($arg: $ty) -> option<$ty> $body
         match $fnname($val) {

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

@@ -5,7 +5,7 @@ fn main() {
     assert (m1!(2) == 8);
 
     macro_rules! m1tt (
-        {$a:expr} => {$a*4}
+        ($a:expr) => {$a*4}
     );
     assert(m1tt!(2) == 8);
 }