diff options
| author | bors <bors@rust-lang.org> | 2017-04-26 03:26:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-26 03:26:12 +0000 |
| commit | 4512424391768cfad54efb8ccdb1191f61e338c2 (patch) | |
| tree | 741a957d1c96041611a4c21dc5ce6c9bde4512c5 /src/libstd/sys | |
| parent | 7e7114fe2e26c5ccd6ebbd5686410b61a47820dc (diff) | |
| parent | 1fd8ba9088dc0f945191253076bd5f26511905ce (diff) | |
| download | rust-4512424391768cfad54efb8ccdb1191f61e338c2.tar.gz rust-4512424391768cfad54efb8ccdb1191f61e338c2.zip | |
Auto merge of #41551 - frewsxcv:rollup, r=frewsxcv
Rollup of 9 pull requests - Successful merges: #39983, #41442, #41463, #41500, #41518, #41527, #41528, #41530, #41535 - Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/time.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/time.rs b/src/libstd/sys/unix/time.rs index a08cec38f73..a1ad94872de 100644 --- a/src/libstd/sys/unix/time.rs +++ b/src/libstd/sys/unix/time.rs @@ -157,7 +157,7 @@ mod inner { pub fn sub_duration(&self, other: &Duration) -> Instant { Instant { t: self.t.checked_sub(dur2intervals(other)) - .expect("overflow when adding duration to instant"), + .expect("overflow when subtracting duration from instant"), } } } |