about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-04-06 13:44:51 -0700
committerbors <bors@rust-lang.org>2016-04-06 13:44:51 -0700
commitbf5da36f1dfae45941ec39ef67a41fdbd22c1a50 (patch)
treec019fe043d842df6d5e19c131d304cb541f7e7a8 /src/test
parent943ec3bdfc9ba28e94b6d00a2b53fb2cd8b21655 (diff)
parent862ae9aa75b073f4d753aa8275fb139ab9729d74 (diff)
downloadrust-bf5da36f1dfae45941ec39ef67a41fdbd22c1a50.tar.gz
rust-bf5da36f1dfae45941ec39ef67a41fdbd22c1a50.zip
Auto merge of #32778 - steveklabnik:rollup, r=steveklabnik
Rollup of 12 pull requests

- Successful merges: #31762, #32538, #32634, #32668, #32679, #32691, #32724, #32727, #32744, #32761, #32766, #32774
- Failed merges:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-pass/specialization/specialization-cross-crate-defaults.rs10
-rw-r--r--src/test/run-pass/specialization/specialization-default-methods.rs6
2 files changed, 8 insertions, 8 deletions
diff --git a/src/test/run-pass/specialization/specialization-cross-crate-defaults.rs b/src/test/run-pass/specialization/specialization-cross-crate-defaults.rs
index bc695ea821d..62c7e3e2e44 100644
--- a/src/test/run-pass/specialization/specialization-cross-crate-defaults.rs
+++ b/src/test/run-pass/specialization/specialization-cross-crate-defaults.rs
@@ -26,12 +26,12 @@ impl Foo for LocalOverride {
 }
 
 fn test_foo() {
-    assert!(0i8.foo() == false);
-    assert!(0i32.foo() == false);
-    assert!(0i64.foo() == true);
+    assert!(!0i8.foo());
+    assert!(!0i32.foo());
+    assert!(0i64.foo());
 
-    assert!(LocalDefault.foo() == false);
-    assert!(LocalOverride.foo() == true);
+    assert!(!LocalDefault.foo());
+    assert!(LocalOverride.foo());
 }
 
 fn test_bar() {
diff --git a/src/test/run-pass/specialization/specialization-default-methods.rs b/src/test/run-pass/specialization/specialization-default-methods.rs
index 3f0f21ff03f..9cfc6aabbb4 100644
--- a/src/test/run-pass/specialization/specialization-default-methods.rs
+++ b/src/test/run-pass/specialization/specialization-default-methods.rs
@@ -35,9 +35,9 @@ impl Foo for i64 {
 }
 
 fn test_foo() {
-    assert!(0i8.foo() == false);
-    assert!(0i32.foo() == false);
-    assert!(0i64.foo() == true);
+    assert!(!0i8.foo());
+    assert!(!0i32.foo());
+    assert!(0i64.foo());
 }
 
 // Next, test mixture of explicit `default` and provided methods: