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/libserialize | |
| 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/libserialize')
| -rw-r--r-- | src/libserialize/collection_impls.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libserialize/collection_impls.rs b/src/libserialize/collection_impls.rs index 7ca0f372891..04cd861d687 100644 --- a/src/libserialize/collection_impls.rs +++ b/src/libserialize/collection_impls.rs @@ -76,7 +76,7 @@ impl<E, D:Decoder<E>,T:Decodable<D, E>> Decodable<D, E> for RingBuf<T> { impl< E, S: Encoder<E>, - K: Encodable<S, E> + PartialEq + TotalOrd, + K: Encodable<S, E> + PartialEq + Ord, V: Encodable<S, E> + PartialEq > Encodable<S, E> for TreeMap<K, V> { fn encode(&self, e: &mut S) -> Result<(), E> { @@ -95,7 +95,7 @@ impl< impl< E, D: Decoder<E>, - K: Decodable<D, E> + PartialEq + TotalOrd, + K: Decodable<D, E> + PartialEq + Ord, V: Decodable<D, E> + PartialEq > Decodable<D, E> for TreeMap<K, V> { fn decode(d: &mut D) -> Result<TreeMap<K, V>, E> { @@ -114,7 +114,7 @@ impl< impl< E, S: Encoder<E>, - T: Encodable<S, E> + PartialEq + TotalOrd + T: Encodable<S, E> + PartialEq + Ord > Encodable<S, E> for TreeSet<T> { fn encode(&self, s: &mut S) -> Result<(), E> { s.emit_seq(self.len(), |s| { @@ -131,7 +131,7 @@ impl< impl< E, D: Decoder<E>, - T: Decodable<D, E> + PartialEq + TotalOrd + T: Decodable<D, E> + PartialEq + Ord > Decodable<D, E> for TreeSet<T> { fn decode(d: &mut D) -> Result<TreeSet<T>, E> { d.read_seq(|d, len| { @@ -178,7 +178,7 @@ impl< impl< E, S: Encoder<E>, - K: Encodable<S, E> + Hash<X> + TotalEq, + K: Encodable<S, E> + Hash<X> + Eq, V: Encodable<S, E>, X, H: Hasher<X> @@ -199,7 +199,7 @@ impl< impl< E, D: Decoder<E>, - K: Decodable<D, E> + Hash<S> + TotalEq, + K: Decodable<D, E> + Hash<S> + Eq, V: Decodable<D, E>, S, H: Hasher<S> + Default @@ -221,7 +221,7 @@ impl< impl< E, S: Encoder<E>, - T: Encodable<S, E> + Hash<X> + TotalEq, + T: Encodable<S, E> + Hash<X> + Eq, X, H: Hasher<X> > Encodable<S, E> for HashSet<T, H> { @@ -240,7 +240,7 @@ impl< impl< E, D: Decoder<E>, - T: Decodable<D, E> + Hash<S> + TotalEq, + T: Decodable<D, E> + Hash<S> + Eq, S, H: Hasher<S> + Default > Decodable<D, E> for HashSet<T, H> { |