greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Packages Projects Releases 9 Wiki Activity

There are one million microseconds in a second, not one hundred thousand. (#480) r=fluffyemily

Browse source
This commit is contained in:
Richard Newman 2017-06-16 08:00:14 -07:00 committed by GitHub
parent 20aa11dcbd
commit aa5f569df5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
edn/src/types.rs
View file

@ -563,7 +563,7 @@ pub trait FromMicros {
impl FromMicros for DateTime<UTC> {
fn from_micros(ts: i64) -> Self {
UTC.timestamp(ts / 100_000, ((ts % 100_000).abs() as u32) * 1_000)
UTC.timestamp(ts / 1_000_000, ((ts % 1_000_000).abs() as u32) * 1_000)
}
}
@ -573,7 +573,9 @@ pub trait ToMicros {
impl ToMicros for DateTime<UTC> {
fn to_micros(&self) -> i64 {
(self.timestamp() * 100_000) + (self.timestamp_subsec_micros() as i64)
let major: i64 = self.timestamp() * 1_000_000;
let minor: i64 = self.timestamp_subsec_micros() as i64;
major + minor
}
}