Skip to content

Commit 481ab4e

Browse files
committed
---
yaml --- r: 273203 b: refs/heads/beta c: fd5603b h: refs/heads/master i: 273201: 527ae54 273199: 15c5fa7
1 parent 1b2eebf commit 481ab4e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 96d9408dd9c932d5302c357d37f1a0262dcb51a9
26+
refs/heads/beta: fd5603b6fc8c130da50c2fd49bcd1188ef10a19e
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/compiler-rt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit b6087e82ba1384c4af3adf2dc68e92316f0d4caf
1+
Subproject commit 57315f7e07d09b6f0341ebbcd50dded6c20d782f

branches/beta/src/libstd/sys/unix/time.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ mod inner {
8888
-> Result<Duration, Duration> {
8989
if self >= other {
9090
Ok(if self.t.tv_usec >= other.t.tv_usec {
91-
Duration::new(self.t.tv_sec as u64 - other.t.tv_sec as u64,
92-
(self.t.tv_usec as u32 -
93-
other.t.tv_usec as u32) * 1000)
91+
Duration::new((self.t.tv_sec - other.t.tv_sec) as u64,
92+
((self.t.tv_usec -
93+
other.t.tv_usec) as u32) * 1000)
9494
} else {
95-
Duration::new(self.t.tv_sec as u64 - 1 - other.t.tv_sec as u64,
95+
Duration::new((self.t.tv_sec - 1 - other.t.tv_sec) as u64,
9696
(self.t.tv_usec as u32 + (USEC_PER_SEC as u32) -
9797
other.t.tv_usec as u32) * 1000)
9898
})

0 commit comments

Comments
 (0)