diff --git a/codegen/src/main.rs b/codegen/src/main.rs
index bb7896f..2536540 100644
--- a/codegen/src/main.rs
+++ b/codegen/src/main.rs
@@ -943,6 +943,7 @@
     let mut config = rustfmt::Config::default();
     config.set().emit_mode(rustfmt::EmitMode::Stdout);
     config.set().verbose(rustfmt::Verbosity::Quiet);
+    config.set().format_macro_matchers(true);
     let mut session = rustfmt::Session::new(config, Some(&mut file));
     session
         .format(rustfmt::Input::Text(content.to_string()))
diff --git a/src/gen/fold.rs b/src/gen/fold.rs
index 1f18cc4..54eb51a 100644
--- a/src/gen/fold.rs
+++ b/src/gen/fold.rs
@@ -10,13 +10,13 @@
 use *;
 #[cfg(feature = "full")]
 macro_rules! full {
-    ( $ e : expr ) => {
+    ($e:expr) => {
         $e
     };
 }
 #[cfg(all(feature = "derive", not(feature = "full")))]
 macro_rules! full {
-    ( $ e : expr ) => {
+    ($e:expr) => {
         unreachable!()
     };
 }
@@ -857,7 +857,7 @@
 }
 #[cfg(any(feature = "full", feature = "derive"))]
 macro_rules! fold_span_only {
-    ( $ f : ident : $ t : ident ) => {
+    ($f:ident : $t:ident) => {
         pub fn $f<V: Fold + ?Sized>(_visitor: &mut V, mut _i: $t) -> $t {
             let span = _visitor.fold_span(_i.span());
             _i.set_span(span);
diff --git a/src/gen/visit.rs b/src/gen/visit.rs
index c1aa751..d501ac6 100644
--- a/src/gen/visit.rs
+++ b/src/gen/visit.rs
@@ -9,19 +9,19 @@
 use *;
 #[cfg(feature = "full")]
 macro_rules! full {
-    ( $ e : expr ) => {
+    ($e:expr) => {
         $e
     };
 }
 #[cfg(all(feature = "derive", not(feature = "full")))]
 macro_rules! full {
-    ( $ e : expr ) => {
+    ($e:expr) => {
         unreachable!()
     };
 }
 #[cfg(any(feature = "full", feature = "derive"))]
 macro_rules! skip {
-    ( $ ( $ tt : tt ) * ) => {};
+    ($($tt:tt)*) => {};
 }
 #[doc = r" Syntax tree traversal to walk a shared borrow of a syntax tree."]
 #[doc = r""]
diff --git a/src/gen/visit_mut.rs b/src/gen/visit_mut.rs
index 1a11a6e..14a7970 100644
--- a/src/gen/visit_mut.rs
+++ b/src/gen/visit_mut.rs
@@ -9,19 +9,19 @@
 use *;
 #[cfg(feature = "full")]
 macro_rules! full {
-    ( $ e : expr ) => {
+    ($e:expr) => {
         $e
     };
 }
 #[cfg(all(feature = "derive", not(feature = "full")))]
 macro_rules! full {
-    ( $ e : expr ) => {
+    ($e:expr) => {
         unreachable!()
     };
 }
 #[cfg(any(feature = "full", feature = "derive"))]
 macro_rules! skip {
-    ( $ ( $ tt : tt ) * ) => {};
+    ($($tt:tt)*) => {};
 }
 #[doc = r" Syntax tree traversal to mutate an exclusive borrow of a syntax tree in"]
 #[doc = r" place."]