Skip to content

Commit 290ed02

Browse files
Use assert_ne in hash tests
The hash tests were written before the assert_ne macro was added to the standard library. The assert_ne macro provides better output in case of a failure.
1 parent abc3073 commit 290ed02

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

src/libcore/tests/hash/sip.rs

+20-17
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ fn test_siphash_2_4() {
238238
#[cfg(target_pointer_width = "32")]
239239
fn test_hash_usize() {
240240
let val = 0xdeadbeef_deadbeef_u64;
241-
assert!(hash(&(val as u64)) != hash(&(val as usize)));
241+
assert_ne!(hash(&(val as u64)), hash(&(val as usize)));
242242
assert_eq!(hash(&(val as u32)), hash(&(val as usize)));
243243
}
244244

@@ -247,7 +247,7 @@ fn test_hash_usize() {
247247
fn test_hash_usize() {
248248
let val = 0xdeadbeef_deadbeef_u64;
249249
assert_eq!(hash(&(val as u64)), hash(&(val as usize)));
250-
assert!(hash(&(val as u32)) != hash(&(val as usize)));
250+
assert_ne!(hash(&(val as u32)), hash(&(val as usize)));
251251
}
252252

253253
#[test]
@@ -262,14 +262,14 @@ fn test_hash_idempotent() {
262262
fn test_hash_no_bytes_dropped_64() {
263263
let val = 0xdeadbeef_deadbeef_u64;
264264

265-
assert!(hash(&val) != hash(&zero_byte(val, 0)));
266-
assert!(hash(&val) != hash(&zero_byte(val, 1)));
267-
assert!(hash(&val) != hash(&zero_byte(val, 2)));
268-
assert!(hash(&val) != hash(&zero_byte(val, 3)));
269-
assert!(hash(&val) != hash(&zero_byte(val, 4)));
270-
assert!(hash(&val) != hash(&zero_byte(val, 5)));
271-
assert!(hash(&val) != hash(&zero_byte(val, 6)));
272-
assert!(hash(&val) != hash(&zero_byte(val, 7)));
265+
assert_ne!(hash(&val), hash(&zero_byte(val, 0)));
266+
assert_ne!(hash(&val), hash(&zero_byte(val, 1)));
267+
assert_ne!(hash(&val), hash(&zero_byte(val, 2)));
268+
assert_ne!(hash(&val), hash(&zero_byte(val, 3)));
269+
assert_ne!(hash(&val), hash(&zero_byte(val, 4)));
270+
assert_ne!(hash(&val), hash(&zero_byte(val, 5)));
271+
assert_ne!(hash(&val), hash(&zero_byte(val, 6)));
272+
assert_ne!(hash(&val), hash(&zero_byte(val, 7)));
273273

274274
fn zero_byte(val: u64, byte: usize) -> u64 {
275275
assert!(byte < 8);
@@ -281,10 +281,10 @@ fn test_hash_no_bytes_dropped_64() {
281281
fn test_hash_no_bytes_dropped_32() {
282282
let val = 0xdeadbeef_u32;
283283

284-
assert!(hash(&val) != hash(&zero_byte(val, 0)));
285-
assert!(hash(&val) != hash(&zero_byte(val, 1)));
286-
assert!(hash(&val) != hash(&zero_byte(val, 2)));
287-
assert!(hash(&val) != hash(&zero_byte(val, 3)));
284+
assert_ne!(hash(&val), hash(&zero_byte(val, 0)));
285+
assert_ne!(hash(&val), hash(&zero_byte(val, 1)));
286+
assert_ne!(hash(&val), hash(&zero_byte(val, 2)));
287+
assert_ne!(hash(&val), hash(&zero_byte(val, 3)));
288288

289289
fn zero_byte(val: u32, byte: usize) -> u32 {
290290
assert!(byte < 4);
@@ -299,14 +299,17 @@ fn test_hash_no_concat_alias() {
299299
let u = ("a", "abb");
300300

301301
assert!(s != t && t != u);
302-
assert!(hash(&s) != hash(&t) && hash(&s) != hash(&u));
302+
assert_ne!(s, t);
303+
assert_ne!(t, u);
304+
assert_ne!(hash(&s), hash(&t));
305+
assert_ne!(hash(&s), hash(&u));
303306

304307
let u = [1, 0, 0, 0];
305308
let v = (&u[..1], &u[1..3], &u[3..]);
306309
let w = (&u[..], &u[4..4], &u[4..4]);
307310

308-
assert!(v != w);
309-
assert!(hash(&v) != hash(&w));
311+
assert_ne!(v, w);
312+
assert_ne!(hash(&v), hash(&w));
310313
}
311314

312315
#[test]

0 commit comments

Comments
 (0)