commit 62ac72fbce95395704098716fe277ad893df8d0b
author Marcel Hlopko <hlopko@google.com> Fri Dec 10 09:14:58 2021 +0000
committer Marcel Hlopko <hlopko@google.com> Fri Mar 25 22:06:30 2022 +0000
tree 0ca9c0f197244afd0a15814edc0386cc25803b77
parent 162a4c5d68d0f58a82968a63ce306c21fdbc4743

Allow trailing comma in assert_rs/cc_matches macros

PiperOrigin-RevId: 415456028

rs_bindings_from_cc/token_stream_matchers.rs

diff --git a/rs_bindings_from_cc/token_stream_matchers.rs b/rs_bindings_from_cc/token_stream_matchers.rs
index 1d52edf..6f1fb34 100644
--- a/rs_bindings_from_cc/token_stream_matchers.rs
+++ b/rs_bindings_from_cc/token_stream_matchers.rs
@@ -34,7 +34,7 @@
 /// ```
 #[macro_export]
 macro_rules! assert_cc_matches {
-    ($input:expr, $pattern:expr) => {
+    ($input:expr, $pattern:expr $(,)*) => {
         $crate::match_tokens(&$input, &$pattern, $crate::tokens_to_string)
             .expect("input unexpectedly didn't match the pattern");
     };
@@ -44,7 +44,7 @@
 /// using rustfmt.
 #[macro_export]
 macro_rules! assert_rs_matches {
-    ($input:expr, $pattern:expr) => {
+    ($input:expr, $pattern:expr $(,)*) => {
         $crate::match_tokens(&$input, &$pattern, $crate::rs_tokens_to_formatted_string)
             .expect("input unexpectedly didn't match the pattern");
     };
@@ -55,7 +55,7 @@
 /// Pattern can use `...` wildcard. See `assert_cc_matches` for details.
 #[macro_export]
 macro_rules! assert_cc_not_matches {
-    ($input:expr, $pattern:expr) => {
+    ($input:expr, $pattern:expr $(,)*) => {
         $crate::match_tokens(&$input, &$pattern, tokens_to_string)
             .expect_err("input unexpectedly matched the pattern");
     };
@@ -65,7 +65,7 @@
 /// message using rustfmt.
 #[macro_export]
 macro_rules! assert_rs_not_matches {
-    ($input:expr, $pattern:expr) => {
+    ($input:expr, $pattern:expr $(,)*) => {
         $crate::match_tokens(&$input, &$pattern, rs_tokens_to_formatted_string)
             .expect_err("input unexpectedly matched the pattern");
     };
@@ -251,13 +251,25 @@
     use quote::quote;
 
     macro_rules! assert_rs_cc_matches {
-        ($input:expr, $pattern:expr) => {
+        ($input:expr, $pattern:expr $(,)*) => {
             $crate::assert_cc_matches!($input, $pattern);
             $crate::assert_rs_matches!($input, $pattern);
         };
     }
 
     #[test]
+    fn test_optional_trailing_comma() {
+        assert_rs_matches!(quote! {x}, quote! {x});
+        assert_rs_matches!(quote! {x}, quote! {x},);
+        assert_cc_matches!(quote! {x}, quote! {x});
+        assert_cc_matches!(quote! {x}, quote! {x},);
+        assert_rs_not_matches!(quote! {x}, quote! {y});
+        assert_rs_not_matches!(quote! {x}, quote! {y},);
+        assert_cc_not_matches!(quote! {x}, quote! {y});
+        assert_cc_not_matches!(quote! {x}, quote! {y},);
+    }
+
+    #[test]
     fn test_assert_cc_not_matches_accepts_not_matching_pattern() {
         assert_cc_not_matches!(quote! { fn foo() {} }, quote! { fn bar() {} });
         assert_rs_not_matches!(quote! { fn foo() {} }, quote! { fn bar() {} });