Allow a trailing comma in assert_eq/ne macro

rust-lang · Nov 9, 2017 · 6a92c0f · 6a92c0f
1 parent fd9ecfd
commit 6a92c0f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 16 deletions.
diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs
@@ -120,6 +120,9 @@ macro_rules! assert_eq {
             }
         }
     });
+    ($left:expr, $right:expr,) => ({
+        assert_eq!($left, $right)
+    });
     ($left:expr, $right:expr, $($arg:tt)+) => ({
         match (&($left), &($right)) {
             (left_val, right_val) => {
@@ -168,6 +171,9 @@ macro_rules! assert_ne {
             }
         }
     });
+    ($left:expr, $right:expr,) => {
+        assert_ne!($left, $right)
+    };
     ($left:expr, $right:expr, $($arg:tt)+) => ({
         match (&($left), &($right)) {
             (left_val, right_val) => {

diff --git a/...est/ui/macros/assert_eq_trailing_comma.rs → ...test/run-pass/assert-eq-trailing-comma.rs b/...est/ui/macros/assert_eq_trailing_comma.rs → ...test/run-pass/assert-eq-trailing-comma.rs
diff --git a/...est/ui/macros/assert_ne_trailing_comma.rs → ...test/run-pass/assert-ne-trailing-comma.rs b/...est/ui/macros/assert_ne_trailing_comma.rs → ...test/run-pass/assert-ne-trailing-comma.rs
diff --git a/src/test/ui/macros/assert_eq_trailing_comma.stderr b/src/test/ui/macros/assert_eq_trailing_comma.stderr
diff --git a/src/test/ui/macros/assert_ne_trailing_comma.stderr b/src/test/ui/macros/assert_ne_trailing_comma.stderr