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

Auto merge of #32273 - alexcrichton:fix-time-sub, r=aturon

Browse source 
std: Fix overflow when subtracting Instant

This code was currently only exercised on OSX, but this applies the same method
of subtraction used on Linux which doesn't have the same overflow issues.

Note that this currently includes no tests, but that's because this is only
visible with debug assertions enabled. Soon, however, I'll enable debug
assertions on all auto builds on the bots so we should get testing for this.

Closes #32268
This commit is contained in:
bors 2016-03-16 02:58:35 -07:00
commit 9afa5a13cc
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstd/sys/unix/time.rs
View file

@ -88,11 +88,11 @@ mod inner {
-> Result<Duration, Duration> {
if self >= other {
Ok(if self.t.tv_usec >= other.t.tv_usec {
Duration::new(self.t.tv_sec as u64 - other.t.tv_sec as u64,
(self.t.tv_usec as u32 -
other.t.tv_usec as u32) * 1000)
Duration::new((self.t.tv_sec - other.t.tv_sec) as u64,
((self.t.tv_usec -
other.t.tv_usec) as u32) * 1000)
} else {
Duration::new(self.t.tv_sec as u64 - 1 - other.t.tv_sec as u64,
Duration::new((self.t.tv_sec - 1 - other.t.tv_sec) as u64,
(self.t.tv_usec as u32 + (USEC_PER_SEC as u32) -
other.t.tv_usec as u32) * 1000)
})