Rollup merge of #155739 - Voultapher:add-tmp-scope-to-assert-macros, r=Amanieu

Add temporary scope to assert_eq and assert_ne

This is a follow-up to #155431

Author: jhpratt

library/core/src/macros/mod.rs

@@ -40,7 +40,7 @@ macro_rules! panic {
 #[rustc_diagnostic_item = "assert_eq_macro"]
 #[allow_internal_unstable(panic_internals)]
 macro_rules! assert_eq {
-    ($left:expr, $right:expr $(,)?) => {
+    ($left:expr, $right:expr $(,)?) => {{
         match (&$left, &$right) {
             (left_val, right_val) => {
                 if !(*left_val == *right_val) {
@@ -52,8 +52,8 @@ macro_rules! assert_eq {
                 }
             }
         }
-    };
-    ($left:expr, $right:expr, $($arg:tt)+) => {
+    }};
+    ($left:expr, $right:expr, $($arg:tt)+) => {{
         match (&$left, &$right) {
             (left_val, right_val) => {
                 if !(*left_val == *right_val) {
@@ -65,7 +65,7 @@ macro_rules! assert_eq {
                 }
             }
         }
-    };
+    }};
 }
 
 /// Asserts that two expressions are not equal to each other (using [`PartialEq`]).
@@ -96,7 +96,7 @@ macro_rules! assert_eq {
 #[rustc_diagnostic_item = "assert_ne_macro"]
 #[allow_internal_unstable(panic_internals)]
 macro_rules! assert_ne {
-    ($left:expr, $right:expr $(,)?) => {
+    ($left:expr, $right:expr $(,)?) => {{
         match (&$left, &$right) {
             (left_val, right_val) => {
                 if *left_val == *right_val {
@@ -108,8 +108,8 @@ macro_rules! assert_ne {
                 }
             }
         }
-    };
-    ($left:expr, $right:expr, $($arg:tt)+) => {
+    }};
+    ($left:expr, $right:expr, $($arg:tt)+) => {{
         match (&($left), &($right)) {
             (left_val, right_val) => {
                 if *left_val == *right_val {
@@ -121,7 +121,7 @@ macro_rules! assert_ne {
                 }
             }
         }
-    };
+    }};
 }
 
 /// Asserts that an expression matches the provided pattern.

library/coretests/tests/macros.rs

@@ -241,7 +241,19 @@ fn temporary_scope_introduction() {
 
     (assert_matches!(*MutRefWithDrop(&mut val).0, 0), std::mem::take(&mut val));
     (assert_matches!(*MutRefWithDrop(&mut val).0, 0, "msg"), std::mem::take(&mut val));
-
     (debug_assert_matches!(*MutRefWithDrop(&mut val).0, 0), std::mem::take(&mut val));
     (debug_assert_matches!(*MutRefWithDrop(&mut val).0, 0, "msg"), std::mem::take(&mut val));
+
+    (assert_eq!(*MutRefWithDrop(&mut val).0, 0), std::mem::take(&mut val));
+    (assert_eq!(*MutRefWithDrop(&mut val).0, 0, "msg"), std::mem::take(&mut val));
+    (debug_assert_eq!(*MutRefWithDrop(&mut val).0, 0), std::mem::take(&mut val));
+    (debug_assert_eq!(*MutRefWithDrop(&mut val).0, 0, "msg"), std::mem::take(&mut val));
+
+    (assert_ne!(*MutRefWithDrop(&mut val).0, 1), std::mem::take(&mut val));
+    (assert_ne!(*MutRefWithDrop(&mut val).0, 1, "msg"), std::mem::take(&mut val));
+    (debug_assert_ne!(*MutRefWithDrop(&mut val).0, 1), std::mem::take(&mut val));
+    (debug_assert_ne!(*MutRefWithDrop(&mut val).0, 1, "msg"), std::mem::take(&mut val));
+
+    (assert!(*MutRefWithDrop(&mut val).0 == 0), std::mem::take(&mut val));
+    (assert!(*MutRefWithDrop(&mut val).0 == 0, "msg"), std::mem::take(&mut val));
 }