From bba701c59d84eac4e20d0796ec06db8d1cdd39cf Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Sat, 31 May 2014 10:43:52 -0700 Subject: 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] --- src/libstd/str.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libstd/str.rs') diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 11b9d0e85ff..3af3821486f 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -70,7 +70,7 @@ is the same as `&[u8]`. use char::Char; use char; use clone::Clone; -use cmp::{PartialEq, TotalEq, PartialOrd, TotalOrd, Equiv, Ordering}; +use cmp::{PartialEq, Eq, PartialOrd, Ord, Equiv, Ordering}; use container::Container; use default::Default; use fmt; @@ -575,7 +575,7 @@ impl<'a> PartialEq for MaybeOwned<'a> { } } -impl<'a> TotalEq for MaybeOwned<'a> {} +impl<'a> Eq for MaybeOwned<'a> {} impl<'a> PartialOrd for MaybeOwned<'a> { #[inline] @@ -584,7 +584,7 @@ impl<'a> PartialOrd for MaybeOwned<'a> { } } -impl<'a> TotalOrd for MaybeOwned<'a> { +impl<'a> Ord for MaybeOwned<'a> { #[inline] fn cmp(&self, other: &MaybeOwned) -> Ordering { self.as_slice().cmp(&other.as_slice()) -- cgit 1.4.1-3-g733a5