mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

auto merge of #7695 : cmr/rust/assert_eq_msg, r=pnkfelix

Browse source 
This changes it from 

```
left: true does not equal right: false
```

to

```
assertion failed: `(left == right) && (right == left)` (left: `true`, right: `false`)
```
This commit is contained in:
bors 2013-07-11 23:43:45 -07:00
commit 09394774df
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libsyntax/ext/expand.rs
View file

@ -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);
}
}
)

2
src/test/run-fail/assert-eq-macro-fail.rs
View file

@ -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 }