Skip to content

Commit 0939477

Browse files
committed
auto merge of #7695 : cmr/rust/assert_eq_msg, r=pnkfelix
This changes it from ``` left: true does not equal right: false ``` to ``` assertion failed: `(left == right) && (right == left)` (left: `true`, right: `false`) ```
2 parents cc4baac + 26f0a55 commit 0939477

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/libsyntax/ext/expand.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,8 @@ pub fn core_macros() -> @str {
531531
let expected_val = $expected;
532532
// check both directions of equality....
533533
if !((given_val == expected_val) && (expected_val == given_val)) {
534-
fail!(\"left: %? does not equal right: %?\", given_val, expected_val);
534+
fail!(\"assertion failed: `(left == right) && (right == \
535+
left)` (left: `%?`, right: `%?`)\", given_val, expected_val);
535536
}
536537
}
537538
)

src/test/run-fail/assert-eq-macro-fail.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// error-pattern:left: 14 does not equal right: 15
1+
// error-pattern:assertion failed: `(left == right) && (right == left)` (left: `14`, right: `15`)
22

33
#[deriving(Eq)]
44
struct Point { x : int }

0 commit comments

Comments
 (0)