Support trailing commas in the elements_are!, unordered_elements_are!, contains_each!, and is_contained_in! macros.

This brings the behaviour of those macros in line with other procedural macros accepting variable argument lists as well as Rust in general.

PiperOrigin-RevId: 503913288

Author: hovinenb

googletest/src/matchers/elements_are_matcher.rs

@@ -21,7 +21,7 @@
 /// Do not use with unordered containers. Prefer unordered_elements_are!(...).
 #[macro_export]
 macro_rules! elements_are {
-    ($($matcher:expr),*) => {{
+    ($($matcher:expr),* $(,)?) => {{
         #[cfg(google3)]
         use $crate::internal::ElementsAre;
         #[cfg(not(google3))]
@@ -128,6 +128,12 @@ mod tests {
         verify_that!(value, elements_are![eq(1), eq(2), eq(3)])
     }
 
+    #[google_test]
+    fn elements_are_supports_trailing_comma() -> Result<()> {
+        let value = vec![1, 2, 3];
+        verify_that!(value, elements_are![eq(1), eq(2), eq(3),])
+    }
+
     #[google_test]
     fn elements_are_returns_no_match_when_expected_and_actual_sizes_differ() -> Result<()> {
         let value = vec![1, 2];

googletest/src/matchers/unordered_elements_are_matcher.rs

@@ -42,7 +42,7 @@
 ///    matchers.
 #[macro_export]
 macro_rules! unordered_elements_are {
-    ($($matcher:expr),*) => {{
+    ($($matcher:expr),* $(,)?) => {{
         #[cfg(google3)]
         use $crate::internal::{UnorderedElementsAre, Requirements};
         #[cfg(not(google3))]
@@ -85,7 +85,7 @@ macro_rules! unordered_elements_are {
 ///    matchers did not have corresponding unique elements in the container.
 #[macro_export]
 macro_rules! contains_each {
-    ($($matcher:expr),*) => {{
+    ($($matcher:expr),* $(,)?) => {{
         #[cfg(google3)]
         use $crate::internal::{UnorderedElementsAre, Requirements};
         #[cfg(not(google3))]
@@ -130,7 +130,7 @@ macro_rules! contains_each {
 ///    container elements did not have corresponding matchers.
 #[macro_export]
 macro_rules! is_contained_in {
-    ($($matcher:expr),*) => {{
+    ($($matcher:expr),* $(,)?) => {{
         #[cfg(google3)]
         use $crate::internal::{UnorderedElementsAre, Requirements};
         #[cfg(not(google3))]
@@ -734,6 +734,12 @@ mod tests {
         verify_that!(value, unordered_elements_are![eq(1), eq(2), eq(3)])
     }
 
+    #[google_test]
+    fn unordered_elements_are_matches_vector_with_trailing_comma() -> Result<()> {
+        let value = vec![1, 2, 3];
+        verify_that!(value, unordered_elements_are![eq(1), eq(2), eq(3),])
+    }
+
     #[google_test]
     fn unordered_elements_are_matches_size() -> Result<()> {
         let value = vec![1, 2];
@@ -811,6 +817,11 @@ Actual: [1, 4, 3], whose element #1 does not match any expected elements and no
         verify_that!(vec![2, 3, 4], contains_each!(eq(2), eq(3), eq(4)))
     }
 
+    #[google_test]
+    fn contains_each_supports_trailing_comma() -> Result<()> {
+        verify_that!(vec![2, 3, 4], contains_each!(eq(2), eq(3), eq(4),))
+    }
+
     #[google_test]
     fn contains_each_matches_when_no_matchers_present() -> Result<()> {
         verify_that!(vec![2, 3, 4], contains_each!())
@@ -867,6 +878,11 @@ Actual: [1, 4, 3], whose element #1 does not match any expected elements and no
         verify_that!(vec![2, 3, 4], is_contained_in!(eq(2), eq(3), eq(4)))
     }
 
+    #[google_test]
+    fn is_contained_supports_trailing_comma() -> Result<()> {
+        verify_that!(vec![2, 3, 4], is_contained_in!(eq(2), eq(3), eq(4),))
+    }
+
     #[google_test]
     fn is_contained_in_matches_when_container_is_empty() -> Result<()> {
         verify_that!(vec![], is_contained_in!(eq(2), eq(3), eq(4)))