xeos
/
chrono
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed an unintentionally overflowing Duration constructors; made tests valid on 32-bit platform.

This commit is contained in:
Kang Seonghoon 2014-05-31 00:12:38 +09:00
parent c697e1fd92
commit b11484613f
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/chrono/duration.rs
View File

@ -53,12 +53,16 @@ impl Duration {
#[inline] #[inline]
pub fn hours(hours: int) -> Duration { pub fn hours(hours: int) -> Duration {
Duration::seconds(hours * 3600) let (days, hours) = hours.div_mod_floor(&(SECS_PER_DAY / 3600));
let secs = hours * 3600;
Duration { secs: secs as u32, ..Duration::days(days) }
} }
#[inline] #[inline]
pub fn minutes(mins: int) -> Duration { pub fn minutes(mins: int) -> Duration {
Duration::seconds(mins * 60) let (days, mins) = mins.div_mod_floor(&(SECS_PER_DAY / 60));
let secs = mins * 60;
Duration { secs: secs as u32, ..Duration::days(days) }
} }
#[inline] #[inline]
@ -69,12 +73,16 @@ impl Duration {
#[inline] #[inline]
pub fn milliseconds(millis: int) -> Duration { pub fn milliseconds(millis: int) -> Duration {
Duration::nanoseconds(millis * 1_000_000) let (secs, millis) = millis.div_mod_floor(&(NANOS_PER_SEC / 1_000_000));
let nanos = millis * 1_000_000;
Duration { nanos: nanos as u32, ..Duration::seconds(secs) }
} }
#[inline] #[inline]
pub fn microseconds(micros: int) -> Duration { pub fn microseconds(micros: int) -> Duration {
Duration::nanoseconds(micros * 1_000) let (secs, micros) = micros.div_mod_floor(&(NANOS_PER_SEC / 1_000));
let nanos = micros * 1_000;
Duration { nanos: nanos as u32, ..Duration::seconds(secs) }
} }
#[inline] #[inline]
@ -282,8 +290,8 @@ mod tests {
Duration::days(1) + Duration::seconds(3)); Duration::days(1) + Duration::seconds(3));
assert_eq!(Duration::days(10) - Duration::seconds(1000), Duration::seconds(863000)); assert_eq!(Duration::days(10) - Duration::seconds(1000), Duration::seconds(863000));
assert_eq!(Duration::days(10) - Duration::seconds(1000000), Duration::seconds(-136000)); assert_eq!(Duration::days(10) - Duration::seconds(1000000), Duration::seconds(-136000));
assert_eq!(Duration::days(2) + Duration::seconds(86391) + Duration::nanoseconds(9876543210), assert_eq!(Duration::days(2) + Duration::seconds(86399) + Duration::nanoseconds(1234567890),
Duration::days(3) + Duration::nanoseconds(876543210)); Duration::days(3) + Duration::nanoseconds(234567890));
assert_eq!(-Duration::days(3), Duration::days(-3)); assert_eq!(-Duration::days(3), Duration::days(-3));
assert_eq!(-(Duration::days(3) + Duration::seconds(70)), assert_eq!(-(Duration::days(3) + Duration::seconds(70)),
Duration::days(-4) + Duration::seconds(86400-70)); Duration::days(-4) + Duration::seconds(86400-70));