Fix lifetime ordering in serialize_trait_object

dtolnay · Mar 16, 2022 · 945302f · 945302f
1 parent 6b6bde1
commit 945302f
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/macros.rs b/src/macros.rs
@@ -42,9 +42,14 @@ macro_rules! __internal_serialize_trait_object {
         $crate::__internal_serialize_trait_object!(path () ($first) $($rest)*);
     };
 
-    // End of generics.
+    // End of generics with trailing comma.
+    (generics ($($generics:tt)*) () , > $($rest:tt)*) => {
+        $crate::__internal_serialize_trait_object!(path ($($generics)* ,) () $($rest)*);
+    };
+
+    // End of generics without trailing comma.
     (generics ($($generics:tt)*) () > $($rest:tt)*) => {
-        $crate::__internal_serialize_trait_object!(path ($($generics)*) () $($rest)*);
+        $crate::__internal_serialize_trait_object!(path ($($generics)* ,) () $($rest)*);
     };
 
     // Generics open bracket.
@@ -80,7 +85,7 @@ macro_rules! __internal_serialize_trait_object {
     // Expand into four impls.
     (sendsync ($($generics:tt)*) ($($path:tt)*) ($($bound:tt)*)) => {
         $crate::__internal_serialize_trait_object!(impl ($($generics)*) ($($path)*) ($($bound)*) {
-            fn __check_erased_serialize_supertrait<__T, $($generics)*>()
+            fn __check_erased_serialize_supertrait<$($generics)* __T>()
             where
                 __T: ?$crate::private::Sized + $($path)*,
                 $($bound)*