Move general pattern to the end to avoid accidental processing before the sequence-specialized cases.

We want to put the sequence-specialized cases up front, so that they are first checked before falling through to the general cases.

PiperOrigin-RevId: 695348636

Author: Googler

googletest/src/assertions.rs

@@ -120,6 +120,7 @@
 /// not supported; see [Rust by Example](https://doc.rust-lang.org/rust-by-example/primitives/tuples.html#tuples).
 #[macro_export]
 macro_rules! verify_that {
+    // specialized to sequences:
     ($actual:expr, [$($expecteds:expr),+ $(,)?]) => {
         {
             use $crate::assertions::internal::Subject as _;
@@ -129,6 +130,8 @@ macro_rules! verify_that {
             )
         }
     };
+
+    // specialized to unordered sequences:
     ($actual:expr, {$($expecteds:expr),+ $(,)?}) => {
         {
             use $crate::assertions::internal::Subject as  _;
@@ -138,6 +141,8 @@ macro_rules! verify_that {
             )
         }
     };
+
+    // general case:
     ($actual:expr, $expected:expr $(,)?) => {
         {
             use $crate::assertions::internal::Subject as  _;
@@ -1373,12 +1378,6 @@ macro_rules! expect_that {
         $crate::verify_that!($actual, {$($expected),*}).and_log_failure();
     }};
 
-    // general case:
-    ($actual:expr, $expected:expr $(,)?) => {{
-        use $crate::GoogleTestSupport as _;
-        $crate::verify_that!($actual, $expected).and_log_failure();
-    }};
-
     // w/ format args, specialized to sequence:
     ($actual:expr, [$($expected:expr),*], $($format_args:expr),* $(,)?) => {
         use $crate::GoogleTestSupport as _;
@@ -1395,6 +1394,12 @@ macro_rules! expect_that {
             .and_log_failure()
     };
 
+    // general case:
+    ($actual:expr, $expected:expr $(,)?) => {{
+        use $crate::GoogleTestSupport as _;
+        $crate::verify_that!($actual, $expected).and_log_failure();
+    }};
+
     // w/ format args, general case:
     ($actual:expr, $expected:expr, $($format_args:expr),* $(,)?) => {
         use $crate::GoogleTestSupport as _;

integration_tests/src/integration_tests.rs

@@ -106,6 +106,11 @@ mod tests {
         expect_that!(vec![1, 2], [eq(&1), eq(&2)], "A custom error message");
     }
 
+    #[gtest]
+    fn expect_that_with_unordered_elements_supports_custom_error_msg() {
+        expect_that!(vec![1, 2], {eq(&2), eq(&1)}, "A custom error message");
+    }
+
     #[gtest]
     fn should_fail_on_assertion_failure() -> Result<()> {
         let status = run_external_process("simple_assertion_failure").status()?;