De-Total

Author: sfackler

src/error.rs

@@ -13,7 +13,7 @@ use types::PostgresType;
 macro_rules! make_errors(
     ($($code:expr => $error:ident),+) => (
         /// SQLSTATE error codes
-        #[deriving(PartialEq, TotalEq, Clone)]
+        #[deriving(PartialEq, Eq, Clone)]
         #[allow(missing_doc)]
         pub enum PostgresSqlState {
             $($error,)+

src/lib.rs

@@ -1240,7 +1240,7 @@ impl<'conn> PostgresStatement<'conn> {
 }
 
 /// Information about a column of the result of a query.
-#[deriving(PartialEq, TotalEq)]
+#[deriving(PartialEq, Eq)]
 pub struct ResultDescription {
     /// The name of the column
     pub name: String,

src/types/array.rs

@@ -4,7 +4,7 @@ use std::mem;
 use std::slice;
 
 /// Information about a dimension of an array
-#[deriving(PartialEq, TotalEq, Clone, Show)]
+#[deriving(PartialEq, Eq, Clone, Show)]
 pub struct DimensionInfo {
     /// The size of the dimension
     pub len: uint,
@@ -70,7 +70,7 @@ trait InternalMutableArray<T>: MutableArray<T> {
 }
 
 /// A multi-dimensional array
-#[deriving(PartialEq, TotalEq, Clone)]
+#[deriving(PartialEq, Eq, Clone)]
 pub struct ArrayBase<T> {
     info: Vec<DimensionInfo>,
     data: Vec<T>,

src/types/mod.rs

@@ -77,7 +77,7 @@ static RANGE_EMPTY: i8           = 0b0000_0001;
 macro_rules! make_postgres_type(
     ($(#[$doc:meta] $oid:ident => $variant:ident $(member $member:ident)*),+) => (
         /// A Postgres type
-        #[deriving(PartialEq, TotalEq, Clone, Show)]
+        #[deriving(PartialEq, Eq, Clone, Show)]
         pub enum PostgresType {
             $(
                 #[$doc]

src/types/range.rs

@@ -125,7 +125,7 @@ impl Normalizable for Timespec {
     }
 }
 
-#[deriving(PartialEq, TotalEq)]
+#[deriving(PartialEq, Eq)]
 enum BoundSide {
     Upper,
     Lower
@@ -156,7 +156,7 @@ impl BoundSided for LowerBound {
 }
 
 /// The type of a range bound
-#[deriving(PartialEq, TotalEq, Clone)]
+#[deriving(PartialEq, Eq, Clone)]
 pub enum BoundType {
     /// The bound includes its value
     Inclusive,
@@ -207,7 +207,7 @@ impl<S: BoundSided, T: PartialEq> PartialEq for RangeBound<S, T> {
     }
 }
 
-impl<S: BoundSided, T: TotalEq> TotalEq for RangeBound<S, T> {}
+impl<S: BoundSided, T: Eq> Eq for RangeBound<S, T> {}
 
 impl<S: BoundSided, T: PartialOrd> PartialOrd for RangeBound<S, T> {
     fn lt(&self, other: &RangeBound<S, T>) -> bool {
@@ -219,7 +219,7 @@ impl<S: BoundSided, T: PartialOrd> PartialOrd for RangeBound<S, T> {
     }
 }
 
-impl<S: BoundSided, T: TotalOrd> TotalOrd for RangeBound<S, T> {
+impl<S: BoundSided, T: Ord> Ord for RangeBound<S, T> {
     fn cmp(&self, other: &RangeBound<S, T>) -> Ordering {
         match (BoundSided::side(None::<S>), self.type_, other.type_,
                 self.value.cmp(&other.value)) {
@@ -256,7 +256,7 @@ impl<'a, S: BoundSided, T: PartialEq> PartialEq for OptBound<'a, S, T> {
     }
 }
 
-impl<'a, S: BoundSided, T: TotalEq> TotalEq for OptBound<'a, S, T> {}
+impl<'a, S: BoundSided, T: Eq> Eq for OptBound<'a, S, T> {}
 
 impl<'a, S: BoundSided, T: PartialOrd> PartialOrd for OptBound<'a, S, T> {
     fn lt(&self, other: &OptBound<'a, S, T>) -> bool {
@@ -270,12 +270,12 @@ impl<'a, S: BoundSided, T: PartialOrd> PartialOrd for OptBound<'a, S, T> {
 }
 
 /// Represents a range of values.
-#[deriving(PartialEq, TotalEq, Clone)]
+#[deriving(PartialEq, Eq, Clone)]
 pub struct Range<T> {
     inner: InnerRange<T>,
 }
 
-#[deriving(PartialEq, TotalEq, Clone)]
+#[deriving(PartialEq, Eq, Clone)]
 enum InnerRange<T> {
     Empty,
     Normal(Option<RangeBound<LowerBound, T>>,