diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-05-31 10:43:52 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-01 10:31:27 -0700 |
| commit | bba701c59d84eac4e20d0796ec06db8d1cdd39cf (patch) | |
| tree | 3c2109ca567bbc7e7b8d66da7282dac8f8926da6 /src/test/run-pass/deriving-cmp-generic-struct-enum.rs | |
| parent | c605c2b57b412402e6b491e91852fd9dbadeb551 (diff) | |
| download | rust-bba701c59d84eac4e20d0796ec06db8d1cdd39cf.tar.gz rust-bba701c59d84eac4e20d0796ec06db8d1cdd39cf.zip | |
std: Drop Total from Total{Eq,Ord}
This completes the last stage of the renaming of the comparison hierarchy of traits. This change renames TotalEq to Eq and TotalOrd to Ord. In the future the new Eq/Ord will be filled out with their appropriate methods, but for now this change is purely a renaming change. [breaking-change]
Diffstat (limited to 'src/test/run-pass/deriving-cmp-generic-struct-enum.rs')
| -rw-r--r-- | src/test/run-pass/deriving-cmp-generic-struct-enum.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/run-pass/deriving-cmp-generic-struct-enum.rs b/src/test/run-pass/deriving-cmp-generic-struct-enum.rs index a6040049a2f..5958538d80e 100644 --- a/src/test/run-pass/deriving-cmp-generic-struct-enum.rs +++ b/src/test/run-pass/deriving-cmp-generic-struct-enum.rs @@ -10,7 +10,7 @@ #![feature(struct_variant)] -#[deriving(PartialEq, TotalEq, PartialOrd, TotalOrd)] +#[deriving(PartialEq, Eq, PartialOrd, Ord)] enum ES<T> { ES1 { x: T }, ES2 { x: T, y: T } @@ -20,7 +20,7 @@ enum ES<T> { pub fn main() { let (es11, es12, es21, es22) = (ES1 {x: 1}, ES1 {x: 2}, ES2 {x: 1, y: 1}, ES2 {x: 1, y: 2}); - // in order for both PartialOrd and TotalOrd + // in order for both PartialOrd and Ord let ess = [es11, es12, es21, es22]; for (i, es1) in ess.iter().enumerate() { @@ -42,7 +42,7 @@ pub fn main() { assert_eq!(*es1 <= *es2, le); assert_eq!(*es1 >= *es2, ge); - // TotalOrd + // Ord assert_eq!(es1.cmp(es2), ord); } } |
