From 8dc6445e38e163ff0c195f0ee11f7b1532f563dc Mon Sep 17 00:00:00 2001 From: Corey Richardson Date: Wed, 10 Jul 2013 13:07:26 -0400 Subject: [PATCH 1/2] Change the assert_eq message to be more verbose. Closes #6221 --- src/libsyntax/ext/expand.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 71e0d49493b81..b5d7d94c31314 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -531,7 +531,8 @@ pub fn core_macros() -> @str { let expected_val = $expected; // check both directions of equality.... if !((given_val == expected_val) && (expected_val == given_val)) { - fail!(\"left: %? does not equal right: %?\", given_val, expected_val); + fail!(\"assertion failed: `(left == right) && (right == \ + left)` (left: `%?`, right: `%?`)\", given_val, expected_val); } } ) From 26f0a55f76e2b40c5308a86bb774b1b541b5d6fe Mon Sep 17 00:00:00 2001 From: Corey Richardson Date: Wed, 10 Jul 2013 13:14:31 -0400 Subject: [PATCH 2/2] fix test --- src/test/run-fail/assert-eq-macro-fail.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/run-fail/assert-eq-macro-fail.rs b/src/test/run-fail/assert-eq-macro-fail.rs index facfb89409c28..a31bd25a6f1d6 100644 --- a/src/test/run-fail/assert-eq-macro-fail.rs +++ b/src/test/run-fail/assert-eq-macro-fail.rs @@ -1,4 +1,4 @@ -// error-pattern:left: 14 does not equal right: 15 +// error-pattern:assertion failed: `(left == right) && (right == left)` (left: `14`, right: `15`) #[deriving(Eq)] struct Point { x : int }