user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #16972 : ruud-v-a/rust/timespec-arithmetic, r=alexcrichton

Browse source 
Changing from `Timespec` to `Duration` introduced a bug for negative durations. This fixes that.
This commit is contained in:
bors 2014-09-04 03:01:03 +00:00
commit c95aa9950f
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libtime/lib.rs
View file

@ -103,6 +103,9 @@ impl Add<Duration, Timespec> for Timespec {
if nsec >= NSEC_PER_SEC {
nsec -= NSEC_PER_SEC;
sec += 1;
} else if nsec < 0 {
nsec += NSEC_PER_SEC;
sec -= 1;
}
Timespec::new(sec, nsec)
}
@ -1533,6 +1536,12 @@ mod tests {
let w = u + v;
assert_eq!(w.sec, 4);
assert_eq!(w.nsec, 1);
let k = Timespec::new(1, 0);
let l = Duration::nanoseconds(-1);
let m = k + l;
assert_eq!(m.sec, 0);
assert_eq!(m.nsec, 999_999_999);
}
fn test_timespec_sub() {