Merge pull request #303 from google:support-trailing-comma-with-special-syntax

PiperOrigin-RevId: 564299799

Author: copybara-github

googletest/src/assertions.rs

@@ -120,15 +120,15 @@
 /// not supported; see [Rust by Example](https://doc.rust-lang.org/rust-by-example/primitives/tuples.html#tuples).
 #[macro_export]
 macro_rules! verify_that {
-    ($actual:expr, [$($expecteds:expr),+]) => {
+    ($actual:expr, [$($expecteds:expr),+ $(,)?]) => {
         $crate::assertions::internal::check_matcher(
             &$actual,
             $crate::elements_are![$($expecteds),+],
             stringify!($actual),
             $crate::internal::source_location::SourceLocation::new(file!(), line!(), column!()),
         )
     };
-    ($actual:expr, {$($expecteds:expr),+}) => {
+    ($actual:expr, {$($expecteds:expr),+ $(,)?}) => {
         $crate::assertions::internal::check_matcher(
             &$actual,
             $crate::unordered_elements_are![$($expecteds),+],

integration_tests/src/integration_tests.rs

@@ -36,6 +36,17 @@ mod tests {
         verify_that!(vec![1, 2], {eq(2), eq(1)})
     }
 
+    #[test]
+    fn verify_that_with_short_elements_are_syntax_supports_trailing_comma() -> Result<()> {
+        verify_that!(vec![1, 2], [eq(1), eq(2),])
+    }
+
+    #[test]
+    fn verify_that_with_short_unordered_elements_are_syntax_supports_trailing_comma() -> Result<()>
+    {
+        verify_that!(vec![1, 2], {eq(2), eq(1),})
+    }
+
     #[test]
     fn should_pass_with_assert_that() -> Result<()> {
         let value = 2;