Imported Upstream version 1.1.0+dfsg1

[rustc.git] / src / test / run-pass / deriving-cmp-generic-struct.rs

diff --git a/src/test/run-pass/deriving-cmp-generic-struct.rs b/src/test/run-pass/deriving-cmp-generic-struct.rs
index 426bfd7eb2f191a02fb64f8bcf195625d321167e..d6c73f394acaa91d9f5c471a5d5b3362709c9d23 100644 (file)
--- a/src/test/run-pass/deriving-cmp-generic-struct.rs
+++ b/src/test/run-pass/deriving-cmp-generic-struct.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving(Eq, TotalEq, Ord, TotalOrd)]
+#[derive(PartialEq, Eq, PartialOrd, Ord)]
 struct S<T> {
     x: T,
     y: T
@@ -18,11 +18,11 @@ pub fn main() {
     let s1 = S {x: 1, y: 1};
     let s2 = S {x: 1, y: 2};
 
-    // in order for both Ord and TotalOrd
+    // in order for both PartialOrd and Ord
     let ss = [s1, s2];
 
-    for ss.iter().enumerate().advance |(i, s1)| {
-        for ss.iter().enumerate().advance |(j, s2)| {
+    for (i, s1) in ss.iter().enumerate() {
+        for (j, s2) in ss.iter().enumerate() {
             let ord = i.cmp(&j);
 
             let eq = i == j;
@@ -31,21 +31,18 @@ pub fn main() {
             let gt = i > j;
             let ge = i >= j;
 
-            // Eq
+            // PartialEq
             assert_eq!(*s1 == *s2, eq);
             assert_eq!(*s1 != *s2, !eq);
 
-            // TotalEq
-            assert_eq!(s1.equals(s2), eq);
-
-            // Ord
+            // PartialOrd
             assert_eq!(*s1 < *s2, lt);
             assert_eq!(*s1 > *s2, gt);
 
             assert_eq!(*s1 <= *s2, le);
             assert_eq!(*s1 >= *s2, ge);
 
-            // TotalOrd
+            // Ord
             assert_eq!(s1.cmp(s2), ord);
         }
     }