From 8e53d61afe1c86954688455956e86a69956f483c Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Fri, 14 Mar 2014 21:50:23 -0700 Subject: [PATCH] Implement TotalEq and TotalOrd for Timespec There's a test making sure that Ord works, so the order dependence shouldn't be an issue --- src/libtime/lib.rs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/libtime/lib.rs b/src/libtime/lib.rs index 019ad2c4b4c32..a3ddf35b69b6b 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.