diff options
| author | Konrad Borowski <konrad.borowski@kontomatik.com> | 2017-11-09 12:36:38 +0100 |
|---|---|---|
| committer | Konrad Borowski <konrad.borowski@kontomatik.com> | 2017-11-09 14:14:49 +0100 |
| commit | 6a92c0fdbddbda6fcb0c6215f64240d228e4b2f5 (patch) | |
| tree | ba101debdd23491088c8f90d355aa36d2dcb2483 | |
| parent | fd9ecfdfd01c0954172a002cc806174a077b9e3d (diff) | |
| download | rust-6a92c0fdbddbda6fcb0c6215f64240d228e4b2f5.tar.gz rust-6a92c0fdbddbda6fcb0c6215f64240d228e4b2f5.zip | |
Allow a trailing comma in assert_eq/ne macro
| -rw-r--r-- | src/libcore/macros.rs | 6 | ||||
| -rw-r--r-- | src/test/run-pass/assert-eq-trailing-comma.rs (renamed from src/test/ui/macros/assert_eq_trailing_comma.rs) | 0 | ||||
| -rw-r--r-- | src/test/run-pass/assert-ne-trailing-comma.rs (renamed from src/test/ui/macros/assert_ne_trailing_comma.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/macros/assert_eq_trailing_comma.stderr | 8 | ||||
| -rw-r--r-- | src/test/ui/macros/assert_ne_trailing_comma.stderr | 8 |
5 files changed, 6 insertions, 16 deletions
diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs index 12667036444..c410c2d9004 100644 --- 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/src/test/ui/macros/assert_eq_trailing_comma.rs b/src/test/run-pass/assert-eq-trailing-comma.rs index d98baf640a8..d98baf640a8 100644 --- a/src/test/ui/macros/assert_eq_trailing_comma.rs +++ b/src/test/run-pass/assert-eq-trailing-comma.rs diff --git a/src/test/ui/macros/assert_ne_trailing_comma.rs b/src/test/run-pass/assert-ne-trailing-comma.rs index 4d3c29da8b2..4d3c29da8b2 100644 --- a/src/test/ui/macros/assert_ne_trailing_comma.rs +++ b/src/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 deleted file mode 100644 index 1b46e94584e..00000000000 --- a/src/test/ui/macros/assert_eq_trailing_comma.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: unexpected end of macro invocation - --> $DIR/assert_eq_trailing_comma.rs:12:20 - | -12 | assert_eq!(1, 1,); - | ^ - -error: aborting due to previous error - diff --git a/src/test/ui/macros/assert_ne_trailing_comma.stderr b/src/test/ui/macros/assert_ne_trailing_comma.stderr deleted file mode 100644 index 33d2cb0ed82..00000000000 --- a/src/test/ui/macros/assert_ne_trailing_comma.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: unexpected end of macro invocation - --> $DIR/assert_ne_trailing_comma.rs:12:20 - | -12 | assert_ne!(1, 2,); - | ^ - -error: aborting due to previous error - |