diff options
| author | Steven Fackler <sfackler@gmail.com> | 2015-07-05 23:20:00 -0700 |
|---|---|---|
| committer | Steven Fackler <sfackler@gmail.com> | 2015-08-10 20:04:18 -0400 |
| commit | 999bdeca88a06938ac1e1c608091d3afe4d7e173 (patch) | |
| tree | 57274f8e644a2823864cd2d10f938719b0ec9fa2 /src/libstd/sys/unix/net.rs | |
| parent | af32c015aa6fa33cbbc2986e7f72e5c83f242c35 (diff) | |
| download | rust-999bdeca88a06938ac1e1c608091d3afe4d7e173.tar.gz rust-999bdeca88a06938ac1e1c608091d3afe4d7e173.zip | |
Stabilize the Duration API
This commit stabilizes the `std::time` module and the `Duration` type. `Duration::span` remains unstable, and the `Display` implementation for `Duration` has been removed as it is still being reworked and all trait implementations for stable types are de facto stable. This is a [breaking-change] to those using `Duration`'s `Display` implementation.
Diffstat (limited to 'src/libstd/sys/unix/net.rs')
| -rw-r--r-- | src/libstd/sys/unix/net.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/sys/unix/net.rs b/src/libstd/sys/unix/net.rs index 37eb7fd2ac8..e65f64f2029 100644 --- a/src/libstd/sys/unix/net.rs +++ b/src/libstd/sys/unix/net.rs @@ -79,19 +79,19 @@ impl Socket { pub fn set_timeout(&self, dur: Option<Duration>, kind: libc::c_int) -> io::Result<()> { let timeout = match dur { Some(dur) => { - if dur.secs() == 0 && dur.extra_nanos() == 0 { + if dur.as_secs() == 0 && dur.subsec_nanos() == 0 { return Err(io::Error::new(io::ErrorKind::InvalidInput, "cannot set a 0 duration timeout")); } - let secs = if dur.secs() > libc::time_t::max_value() as u64 { + let secs = if dur.as_secs() > libc::time_t::max_value() as u64 { libc::time_t::max_value() } else { - dur.secs() as libc::time_t + dur.as_secs() as libc::time_t }; let mut timeout = libc::timeval { tv_sec: secs, - tv_usec: (dur.extra_nanos() / 1000) as libc::suseconds_t, + tv_usec: (dur.subsec_nanos() / 1000) as libc::suseconds_t, }; if timeout.tv_sec == 0 && timeout.tv_usec == 0 { timeout.tv_usec = 1; |
