diff --git a/src/liballoc/benches/linked_list.rs b/src/liballoc/benches/linked_list.rs index 29c5ad2bc6eb2..eedfbe4ca5869 100644 --- a/src/liballoc/benches/linked_list.rs +++ b/src/liballoc/benches/linked_list.rs @@ -48,7 +48,7 @@ fn bench_iter(b: &mut Bencher) { let v = &[0; 128]; let m: LinkedList<_> = v.iter().cloned().collect(); b.iter(|| { - assert!(m.iter().count() == 128); + assert_eq!(m.iter().count(), 128); }) } #[bench] @@ -56,7 +56,7 @@ fn bench_iter_mut(b: &mut Bencher) { let v = &[0; 128]; let mut m: LinkedList<_> = v.iter().cloned().collect(); b.iter(|| { - assert!(m.iter_mut().count() == 128); + assert_eq!(m.iter_mut().count(), 128); }) } #[bench] @@ -64,7 +64,7 @@ fn bench_iter_rev(b: &mut Bencher) { let v = &[0; 128]; let m: LinkedList<_> = v.iter().cloned().collect(); b.iter(|| { - assert!(m.iter().rev().count() == 128); + assert_eq!(m.iter().rev().count(), 128); }) } #[bench] @@ -72,6 +72,6 @@ fn bench_iter_mut_rev(b: &mut Bencher) { let v = &[0; 128]; let mut m: LinkedList<_> = v.iter().cloned().collect(); b.iter(|| { - assert!(m.iter_mut().rev().count() == 128); + assert_eq!(m.iter_mut().rev().count(), 128); }) } diff --git a/src/liballoc/benches/vec_deque_append.rs b/src/liballoc/benches/vec_deque_append.rs index 78ec91d9e3e9b..d7bca727be812 100644 --- a/src/liballoc/benches/vec_deque_append.rs +++ b/src/liballoc/benches/vec_deque_append.rs @@ -28,7 +28,7 @@ fn main() { let l = durations.len(); durations.sort(); - assert!(BENCH_N % 2 == 0); + assert_eq!(BENCH_N % 2, 0); let median = (durations[(l / 2) - 1] + durations[l / 2]) / 2; println!( "\ncustom-bench vec_deque_append {:?} ns/iter\n", diff --git a/src/librustc_codegen_ssa/back/rpath/tests.rs b/src/librustc_codegen_ssa/back/rpath/tests.rs index e42a878d7e45e..37b238ae7c88d 100644 --- a/src/librustc_codegen_ssa/back/rpath/tests.rs +++ b/src/librustc_codegen_ssa/back/rpath/tests.rs @@ -20,7 +20,7 @@ fn test_minimize1() { "rpath2".to_string(), "rpath1".to_string() ]); - assert!(res == [ + assert_eq!(res, [ "rpath1", "rpath2", ]); @@ -40,7 +40,7 @@ fn test_minimize2() { "4a".to_string(), "3".to_string() ]); - assert!(res == [ + assert_eq!(res, [ "1a", "2", "4a", diff --git a/src/libstd/sys_common/bytestring.rs b/src/libstd/sys_common/bytestring.rs index 429ecf6281b3e..9466a8aaf316a 100644 --- a/src/libstd/sys_common/bytestring.rs +++ b/src/libstd/sys_common/bytestring.rs @@ -41,6 +41,6 @@ mod tests { let expected = r#""\xF0hello,\tworld""#; let output = format!("{:?}", Helper(input)); - assert!(output == expected); + assert_eq!(output, expected); } } diff --git a/src/libtest/tests.rs b/src/libtest/tests.rs index 880d02a28ff06..c3064e11e3e9d 100644 --- a/src/libtest/tests.rs +++ b/src/libtest/tests.rs @@ -73,7 +73,7 @@ pub fn do_not_run_ignored_tests() { let (tx, rx) = channel(); run_test(&TestOpts::new(), false, desc, RunStrategy::InProcess, tx, Concurrent::No); let (_, res, _, _) = rx.recv().unwrap(); - assert!(res != TrOk); + assert_ne!(res, TrOk); } #[test] @@ -92,7 +92,7 @@ pub fn ignored_tests_result_in_ignored() { let (tx, rx) = channel(); run_test(&TestOpts::new(), false, desc, RunStrategy::InProcess, tx, Concurrent::No); let (_, res, _, _) = rx.recv().unwrap(); - assert!(res == TrIgnored); + assert_eq!(res, TrIgnored); } #[test] @@ -113,7 +113,7 @@ fn test_should_panic() { let (tx, rx) = channel(); run_test(&TestOpts::new(), false, desc, RunStrategy::InProcess, tx, Concurrent::No); let (_, res, _, _) = rx.recv().unwrap(); - assert!(res == TrOk); + assert_eq!(res, TrOk); } #[test] @@ -134,7 +134,7 @@ fn test_should_panic_good_message() { let (tx, rx) = channel(); run_test(&TestOpts::new(), false, desc, RunStrategy::InProcess, tx, Concurrent::No); let (_, res, _, _) = rx.recv().unwrap(); - assert!(res == TrOk); + assert_eq!(res, TrOk); } #[test] @@ -157,7 +157,7 @@ fn test_should_panic_bad_message() { let (tx, rx) = channel(); run_test(&TestOpts::new(), false, desc, RunStrategy::InProcess, tx, Concurrent::No); let (_, res, _, _) = rx.recv().unwrap(); - assert!(res == TrFailedMsg(format!("{} '{}'", failed_msg, expected))); + assert_eq!(res, TrFailedMsg(format!("{} '{}'", failed_msg, expected))); } #[test] @@ -176,7 +176,7 @@ fn test_should_panic_but_succeeds() { let (tx, rx) = channel(); run_test(&TestOpts::new(), false, desc, RunStrategy::InProcess, tx, Concurrent::No); let (_, res, _, _) = rx.recv().unwrap(); - assert!(res == TrFailedMsg("test did not panic as expected".to_string())); + assert_eq!(res, TrFailedMsg("test did not panic as expected".to_string())); } fn report_time_test_template(report_time: bool) -> Option { @@ -550,7 +550,7 @@ pub fn sort_tests() { ]; for (a, b) in expected.iter().zip(filtered) { - assert!(*a == b.desc.name.to_string()); + assert_eq!(*a, b.desc.name.to_string()); } } diff --git a/src/test/run-fail/panic.rs b/src/test/run-fail/panic.rs index 95f20dedad26c..e4c064179cf06 100644 --- a/src/test/run-fail/panic.rs +++ b/src/test/run-fail/panic.rs @@ -1,4 +1,4 @@ // error-pattern:1 == 2 fn main() { - assert!(1 == 2); + assert_eq!(1, 2); } diff --git a/src/test/ui/issues/issue-5927.rs b/src/test/ui/issues/issue-5927.rs index 847936cc95402..fdb6d0bfe9faa 100644 --- a/src/test/ui/issues/issue-5927.rs +++ b/src/test/ui/issues/issue-5927.rs @@ -3,5 +3,5 @@ fn main() { x(1) => x(1) //~ ERROR cannot find tuple struct/variant `x` in this scope //~^ ERROR cannot find function `x` in this scope }; - assert!(z == 3); + assert_eq!(z, 3); } diff --git a/src/test/ui/mod/mod_file_correct_spans.rs b/src/test/ui/mod/mod_file_correct_spans.rs index c42d2eaa7bd6d..62bc46d3a715a 100644 --- a/src/test/ui/mod/mod_file_correct_spans.rs +++ b/src/test/ui/mod/mod_file_correct_spans.rs @@ -3,6 +3,6 @@ mod mod_file_aux; fn main() { - assert!(mod_file_aux::bar() == 10); + assert_eq!(mod_file_aux::bar(), 10); //~^ ERROR cannot find function `bar` in module `mod_file_aux` }