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/libcore/tuple.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/libcore/tuple.rs')
| -rw-r--r-- | src/libcore/tuple.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libcore/tuple.rs b/src/libcore/tuple.rs index f9a14b1de50..c8cbd49aa89 100644 --- a/src/libcore/tuple.rs +++ b/src/libcore/tuple.rs @@ -28,9 +28,9 @@ //! //! * `Clone` //! * `PartialEq` -//! * `TotalEq` +//! * `Eq` //! * `PartialOrd` -//! * `TotalOrd` +//! * `Ord` //! * `Default` //! //! # Examples @@ -123,7 +123,7 @@ macro_rules! tuple_impls { } #[cfg(not(test))] - impl<$($T:TotalEq),+> TotalEq for ($($T,)+) {} + impl<$($T:Eq),+> Eq for ($($T,)+) {} #[cfg(not(test))] impl<$($T:PartialOrd + PartialEq),+> PartialOrd for ($($T,)+) { @@ -146,7 +146,7 @@ macro_rules! tuple_impls { } #[cfg(not(test))] - impl<$($T:TotalOrd),+> TotalOrd for ($($T,)+) { + impl<$($T:Ord),+> Ord for ($($T,)+) { #[inline] fn cmp(&self, other: &($($T,)+)) -> Ordering { lexical_cmp!($(self.$refN(), other.$refN()),+) @@ -364,7 +364,7 @@ mod tests { assert!(((1.0, 2.0) < (2.0, nan))); assert!(!((2.0, 2.0) < (2.0, nan))); - // TotalOrd + // Ord assert!(small.cmp(&small) == Equal); assert!(big.cmp(&big) == Equal); assert!(small.cmp(&big) == Less); |
