Update some macro tests

Author: RReverser

src/bin/cargo-fmt.rs

@@ -97,7 +97,7 @@ fn execute() -> i32 {
 }
 
 macro_rules! print_usage {
-    ($print:ident, $opts:ident, $reason:expr) => ({
+    ($print: ident, $opts: ident, $reason: expr) => ({
         let msg = format!("{}\nusage: cargo fmt [options]", $reason);
         $print!(
             "{}\nThis utility formats all bin and lib files of the current crate using rustfmt. \

tests/target/macro_not_expr.rs

@@ -1,5 +1,6 @@
 macro_rules! test {
-    ($($t:tt)*) => {}
+    ($($t: tt)*) => {
+    };
 }
 
 fn main() {

tests/target/macros.rs

@@ -141,7 +141,8 @@ fn issue_1555() {
 
 fn issue1178() {
     macro_rules! foo {
-        (#[$attr:meta] $name:ident) => {}
+        (#[$attr: meta] $name: ident) => {
+        };
     }
 
     foo!(
@@ -246,11 +247,15 @@ fn __bindgen_test_layout_HandleWithDtor_open0_int_close0_instantiation() {
 
 // #878
 macro_rules! try_opt {
-    ($expr:expr) => (match $expr {
-        Some(val) => val,
+    ($expr: expr) => {
+        match $expr {
+            Some(val) => val,
 
-        None => { return None; }
-    })
+            None => {
+                return None;
+            }
+        }
+    };
 }
 
 // #2214
@@ -885,23 +890,28 @@ fn macro_in_pattern_position() {
     };
 }
 
-macro foo() {
-
+macro foo {
+    () => {
+    }
 }
 
-pub macro bar($x: ident + $y: expr;) {
-    fn foo($x: Foo) {
-        long_function(
-            a_long_argument_to_a_long_function_is_what_this_is(AAAAAAAAAAAAAAAAAAAAAAAAAAAA),
-            $x.bar($y),
-        );
+pub macro bar {
+    ($x: ident + $y: expr;) => {
+        fn foo($x: Foo) {
+            long_function(
+                a_long_argument_to_a_long_function_is_what_this_is(AAAAAAAAAAAAAAAAAAAAAAAAAAAA),
+                $x.bar($y),
+            );
+        }
     }
 }
 
-macro foo() {
-    // a comment
-    fn foo() {
-        // another comment
-        bar();
+macro foo {
+    () => {
+        // a comment
+        fn foo() {
+            // another comment
+            bar();
+        }
     }
 }