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/libstd/str.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/libstd/str.rs')
| -rw-r--r-- | src/libstd/str.rs | 6 |
1 files changed, 3 insertions, 3 deletions
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()) |
