Skip to content

Commit

Permalink
auto merge of #12906 : sfackler/rust/timespec-total, r=thestinger
Browse files Browse the repository at this point in the history
  • Loading branch information
bors committed Mar 15, 2014
2 parents fc7a112 + 8e53d61 commit 1d828eb
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions src/libtime/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down

0 comments on commit 1d828eb

Please sign in to comment.