diff options
| author | Giles Cope <gilescope@gmail.com> | 2017-06-13 14:17:59 +0100 |
|---|---|---|
| committer | Giles Cope <gilescope@gmail.com> | 2017-06-13 14:31:23 +0100 |
| commit | 87cfb5431edc2f190d3cde62cef803aaeda63c10 (patch) | |
| tree | 3fbfe4bd2b77536a679442d03848ba2fb62652b4 /src/libcore | |
| parent | de8bbd2b164f1839186ce8a5117e86902701bdfe (diff) | |
| download | rust-87cfb5431edc2f190d3cde62cef803aaeda63c10.tar.gz rust-87cfb5431edc2f190d3cde62cef803aaeda63c10.zip | |
Updated tests and fixed inconsistent message on assert_eq
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/macros.rs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs index 5cb56433ac7..f8316d68578 100644 --- a/src/libcore/macros.rs +++ b/src/libcore/macros.rs @@ -117,8 +117,8 @@ macro_rules! assert_eq { (left_val, right_val) => { if !(*left_val == *right_val) { panic!(r#"assertion failed: `(left == right)` -left: `{:?}` -right: `{:?}`"#, left_val, right_val) + left: `{:?}` + right: `{:?}`"#, left_val, right_val) } } } @@ -128,8 +128,8 @@ right: `{:?}`"#, left_val, right_val) (left_val, right_val) => { if !(*left_val == *right_val) { panic!(r#"assertion failed: `(left == right)` -left: `{:?}` -right: `{:?}`: {}"#, left_val, right_val, + left: `{:?}` + right: `{:?}`: {}"#, left_val, right_val, format_args!($($arg)+)) } } @@ -164,8 +164,9 @@ macro_rules! assert_ne { match (&$left, &$right) { (left_val, right_val) => { if *left_val == *right_val { - panic!("assertion failed: `(left != right)` \ - (left: `{:?}`, right: `{:?}`)", left_val, right_val) + panic!(r#"assertion failed: `(left != right)` + left: `{:?}` + right: `{:?}`"#, left_val, right_val) } } } @@ -174,8 +175,9 @@ macro_rules! assert_ne { match (&($left), &($right)) { (left_val, right_val) => { if *left_val == *right_val { - panic!("assertion failed: `(left != right)` \ - (left: `{:?}`, right: `{:?}`): {}", left_val, right_val, + panic!(r#"assertion failed: `(left != right)` + left: `{:?}` + right: `{:?}`: {}"#, left_val, right_val, format_args!($($arg)+)) } } |