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/compile-fail | |
| 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/compile-fail')
8 files changed, 12 insertions, 12 deletions
diff --git a/src/test/compile-fail/deriving-span-TotalEq-enum-struct-variant.rs b/src/test/compile-fail/deriving-span-TotalEq-enum-struct-variant.rs index 07fc3d5c5d9..964e7d8c811 100644 --- a/src/test/compile-fail/deriving-span-TotalEq-enum-struct-variant.rs +++ b/src/test/compile-fail/deriving-span-TotalEq-enum-struct-variant.rs @@ -16,7 +16,7 @@ extern crate rand; #[deriving(PartialEq)] struct Error; -#[deriving(TotalEq,PartialEq)] +#[deriving(Eq,PartialEq)] enum Enum { A { x: Error //~ ERROR diff --git a/src/test/compile-fail/deriving-span-TotalEq-enum.rs b/src/test/compile-fail/deriving-span-TotalEq-enum.rs index e25ebaf7f1b..96e87ca2006 100644 --- a/src/test/compile-fail/deriving-span-TotalEq-enum.rs +++ b/src/test/compile-fail/deriving-span-TotalEq-enum.rs @@ -16,7 +16,7 @@ extern crate rand; #[deriving(PartialEq)] struct Error; -#[deriving(TotalEq,PartialEq)] +#[deriving(Eq,PartialEq)] enum Enum { A( Error //~ ERROR diff --git a/src/test/compile-fail/deriving-span-TotalEq-struct.rs b/src/test/compile-fail/deriving-span-TotalEq-struct.rs index b9b50e5d60b..784c766c057 100644 --- a/src/test/compile-fail/deriving-span-TotalEq-struct.rs +++ b/src/test/compile-fail/deriving-span-TotalEq-struct.rs @@ -16,7 +16,7 @@ extern crate rand; #[deriving(PartialEq)] struct Error; -#[deriving(TotalEq,PartialEq)] +#[deriving(Eq,PartialEq)] struct Struct { x: Error //~ ERROR } diff --git a/src/test/compile-fail/deriving-span-TotalEq-tuple-struct.rs b/src/test/compile-fail/deriving-span-TotalEq-tuple-struct.rs index b6123df4506..3dcff5f80ce 100644 --- a/src/test/compile-fail/deriving-span-TotalEq-tuple-struct.rs +++ b/src/test/compile-fail/deriving-span-TotalEq-tuple-struct.rs @@ -16,7 +16,7 @@ extern crate rand; #[deriving(PartialEq)] struct Error; -#[deriving(TotalEq,PartialEq)] +#[deriving(Eq,PartialEq)] struct Struct( Error //~ ERROR ); diff --git a/src/test/compile-fail/deriving-span-TotalOrd-enum-struct-variant.rs b/src/test/compile-fail/deriving-span-TotalOrd-enum-struct-variant.rs index a8116a817a8..c16e64829dd 100644 --- a/src/test/compile-fail/deriving-span-TotalOrd-enum-struct-variant.rs +++ b/src/test/compile-fail/deriving-span-TotalOrd-enum-struct-variant.rs @@ -13,10 +13,10 @@ #![feature(struct_variant)] extern crate rand; -#[deriving(TotalEq,PartialOrd,PartialEq)] +#[deriving(Eq,PartialOrd,PartialEq)] struct Error; -#[deriving(TotalOrd,TotalEq,PartialOrd,PartialEq)] +#[deriving(Ord,Eq,PartialOrd,PartialEq)] enum Enum { A { x: Error //~ ERROR diff --git a/src/test/compile-fail/deriving-span-TotalOrd-enum.rs b/src/test/compile-fail/deriving-span-TotalOrd-enum.rs index 0e1dc003fbb..4b3f0ce52c7 100644 --- a/src/test/compile-fail/deriving-span-TotalOrd-enum.rs +++ b/src/test/compile-fail/deriving-span-TotalOrd-enum.rs @@ -13,10 +13,10 @@ #![feature(struct_variant)] extern crate rand; -#[deriving(TotalEq,PartialOrd,PartialEq)] +#[deriving(Eq,PartialOrd,PartialEq)] struct Error; -#[deriving(TotalOrd,TotalEq,PartialOrd,PartialEq)] +#[deriving(Ord,Eq,PartialOrd,PartialEq)] enum Enum { A( Error //~ ERROR diff --git a/src/test/compile-fail/deriving-span-TotalOrd-struct.rs b/src/test/compile-fail/deriving-span-TotalOrd-struct.rs index af6f09c4a2c..56d62742378 100644 --- a/src/test/compile-fail/deriving-span-TotalOrd-struct.rs +++ b/src/test/compile-fail/deriving-span-TotalOrd-struct.rs @@ -13,10 +13,10 @@ #![feature(struct_variant)] extern crate rand; -#[deriving(TotalEq,PartialOrd,PartialEq)] +#[deriving(Eq,PartialOrd,PartialEq)] struct Error; -#[deriving(TotalOrd,TotalEq,PartialOrd,PartialEq)] +#[deriving(Ord,Eq,PartialOrd,PartialEq)] struct Struct { x: Error //~ ERROR } diff --git a/src/test/compile-fail/deriving-span-TotalOrd-tuple-struct.rs b/src/test/compile-fail/deriving-span-TotalOrd-tuple-struct.rs index b58dc56a261..2330fdd8b89 100644 --- a/src/test/compile-fail/deriving-span-TotalOrd-tuple-struct.rs +++ b/src/test/compile-fail/deriving-span-TotalOrd-tuple-struct.rs @@ -13,10 +13,10 @@ #![feature(struct_variant)] extern crate rand; -#[deriving(TotalEq,PartialOrd,PartialEq)] +#[deriving(Eq,PartialOrd,PartialEq)] struct Error; -#[deriving(TotalOrd,TotalEq,PartialOrd,PartialEq)] +#[deriving(Ord,Eq,PartialOrd,PartialEq)] struct Struct( Error //~ ERROR ); |