Skip to content

Commit 171e845

Browse files
authored
Rollup merge of rust-lang#63403 - sntdevco:master, r=Centril
Improve test output I'm continuing to improve the test output for liballoc and libcore
2 parents 7a25162 + fb3a013 commit 171e845

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/liballoc/tests/btree/set.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fn test_clone_eq() {
1010
m.insert(1);
1111
m.insert(2);
1212

13-
assert!(m.clone() == m);
13+
assert_eq!(m.clone(), m);
1414
}
1515

1616
#[test]
@@ -28,7 +28,7 @@ fn test_hash() {
2828
y.insert(2);
2929
y.insert(1);
3030

31-
assert!(hash(&x) == hash(&y));
31+
assert_eq!(hash(&x), hash(&y));
3232
}
3333

3434
fn check<F>(a: &[i32], b: &[i32], expected: &[i32], f: F)

src/libcore/tests/slice.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ use core::result::Result::{Ok, Err};
33
#[test]
44
fn test_position() {
55
let b = [1, 2, 3, 5, 5];
6-
assert!(b.iter().position(|&v| v == 9) == None);
7-
assert!(b.iter().position(|&v| v == 5) == Some(3));
8-
assert!(b.iter().position(|&v| v == 3) == Some(2));
9-
assert!(b.iter().position(|&v| v == 0) == None);
6+
assert_eq!(b.iter().position(|&v| v == 9), None);
7+
assert_eq!(b.iter().position(|&v| v == 5), Some(3));
8+
assert_eq!(b.iter().position(|&v| v == 3), Some(2));
9+
assert_eq!(b.iter().position(|&v| v == 0), None);
1010
}
1111

1212
#[test]
1313
fn test_rposition() {
1414
let b = [1, 2, 3, 5, 5];
15-
assert!(b.iter().rposition(|&v| v == 9) == None);
16-
assert!(b.iter().rposition(|&v| v == 5) == Some(4));
17-
assert!(b.iter().rposition(|&v| v == 3) == Some(2));
18-
assert!(b.iter().rposition(|&v| v == 0) == None);
15+
assert_eq!(b.iter().rposition(|&v| v == 9), None);
16+
assert_eq!(b.iter().rposition(|&v| v == 5), Some(4));
17+
assert_eq!(b.iter().rposition(|&v| v == 3), Some(2));
18+
assert_eq!(b.iter().rposition(|&v| v == 0), None);
1919
}
2020

2121
#[test]

src/libcore/tests/time.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use core::time::Duration;
22

33
#[test]
44
fn creation() {
5-
assert!(Duration::from_secs(1) != Duration::from_secs(0));
5+
assert_ne!(Duration::from_secs(1), Duration::from_secs(0));
66
assert_eq!(Duration::from_secs(1) + Duration::from_secs(2),
77
Duration::from_secs(3));
88
assert_eq!(Duration::from_millis(10) + Duration::from_secs(4),

0 commit comments

Comments
 (0)