auto merge of #12906 : sfackler/rust/timespec-total, r=thestinger

1 files changed, 1 insertions, 10 deletions

diff --git a/src/libtime/lib.rs b/src/libtime/lib.rs
index 019ad2c4b4c..a3ddf35b69b 100644
--- a/src/libtime/lib.rs
+++ b/src/libtime/lib.rs
@@ -63,9 +63,7 @@ mod imp {
 }
 
 /// A record specifying a time value in seconds and nanoseconds.
-
-
-#[deriving(Clone, Eq, Encodable, Decodable, Show)]
+#[deriving(Clone, Eq, TotalEq, Ord, TotalOrd, Encodable, Decodable, Show)]
 pub struct Timespec { sec: i64, nsec: i32 }
 /*
  * Timespec assumes that pre-epoch Timespecs have negative sec and positive
@@ -82,13 +80,6 @@ impl Timespec {
     }
 }
 
-impl Ord for Timespec {
-    fn lt(&self, other: &Timespec) -> bool {
-        self.sec < other.sec ||
-            (self.sec == other.sec && self.nsec < other.nsec)
-    }
-}
-
 /**
  * Returns the current time as a `timespec` containing the seconds and
  * nanoseconds since 1970-01-01T00:00:00Z.