Skip to content

Commit 1ec1b1f

Browse files
committed
updated assert_eq test, fixed incorrect assert_ne message and added test.
1 parent f062832 commit 1ec1b1f

File tree

3 files changed

+32
-9
lines changed

3 files changed

+32
-9
lines changed

src/libcore/macros.rs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,9 @@ macro_rules! assert_eq {
116116
match (&$left, &$right) {
117117
(left_val, right_val) => {
118118
if !(*left_val == *right_val) {
119-
panic!("assertion failed: `(left == right)` \
120-
(left: `{:?}`, right: `{:?}`)", left_val, right_val)
119+
panic!(r#"assertion failed: `(left == right)`
120+
left: `{:?}`
121+
right: `{:?}`"#, left_val, right_val)
121122
}
122123
}
123124
}
@@ -126,8 +127,9 @@ macro_rules! assert_eq {
126127
match (&($left), &($right)) {
127128
(left_val, right_val) => {
128129
if !(*left_val == *right_val) {
129-
panic!("assertion failed: `(left == right)` \
130-
(left: `{:?}`, right: `{:?}`): {}", left_val, right_val,
130+
panic!(r#"assertion failed: `(left == right)`
131+
left: `{:?}`
132+
right: `{:?}`: {}"#, left_val, right_val,
131133
format_args!($($arg)+))
132134
}
133135
}
@@ -162,8 +164,9 @@ macro_rules! assert_ne {
162164
match (&$left, &$right) {
163165
(left_val, right_val) => {
164166
if *left_val == *right_val {
165-
panic!("assertion failed: `(left != right)` \
166-
(left: `{:?}`, right: `{:?}`)", left_val, right_val)
167+
panic!(r#"assertion failed: `(left != right)`
168+
left: `{:?}`
169+
right: `{:?}`"#, left_val, right_val)
167170
}
168171
}
169172
}
@@ -172,8 +175,9 @@ macro_rules! assert_ne {
172175
match (&($left), &($right)) {
173176
(left_val, right_val) => {
174177
if *left_val == *right_val {
175-
panic!("assertion failed: `(left != right)` \
176-
(left: `{:?}`, right: `{:?}`): {}", left_val, right_val,
178+
panic!(r#"assertion failed: `(left != right)`
179+
left: `{:?}`
180+
right: `{:?}`: {}"#, left_val, right_val,
177181
format_args!($($arg)+))
178182
}
179183
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// error-pattern:assertion failed: `(left == right)` (left: `14`, right: `15`)
11+
// error-pattern:assertion failed: `(left == right)`
12+
// error-pattern: left: `14`
13+
// error-pattern:right: `15`
1214

1315
fn main() {
1416
assert_eq!(14, 15);
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// error-pattern:assertion failed: `(left != right)`
12+
// error-pattern: left: `14`
13+
// error-pattern:right: `14`
14+
15+
fn main() {
16+
assert_ne!(14, 14);
17+
}

0 commit comments

Comments
 (0)