about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2020-03-03 17:50:08 +0900
committerGitHub <noreply@github.com>2020-03-03 17:50:08 +0900
commitf19684c7cf1819cf42b73d4358740c1392198e4d (patch)
tree7128cfbecc9a276891e46977f4a44a537ddd44eb /src/libstd
parent4699b29a04e84746e28ef688f02993c3b4d54951 (diff)
parent21affdd00d52fba6388f1858a52c253b3f83a90d (diff)
downloadrust-f19684c7cf1819cf42b73d4358740c1392198e4d.tar.gz
rust-f19684c7cf1819cf42b73d4358740c1392198e4d.zip
Rollup merge of #69619 - matthiaskrgr:misc, r=eddyb
more cleanups

* use starts_with() instead of chars().next() == Some(x)
* use subsec_micros() instead of subsec_nanos() / 1000
* use for (idx, item) in iter.enumerate() instead of manually counting loop iterations with variables
* use values() or keys() respectively when iterating only over keys or values of maps.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/sys/unix/net.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/net.rs b/src/libstd/sys/unix/net.rs
index 79b0dc02978..b37675e0a0a 100644
--- a/src/libstd/sys/unix/net.rs
+++ b/src/libstd/sys/unix/net.rs
@@ -280,7 +280,7 @@ impl Socket {
                 };
                 let mut timeout = libc::timeval {
                     tv_sec: secs,
-                    tv_usec: (dur.subsec_nanos() / 1000) as libc::suseconds_t,
+                    tv_usec: dur.subsec_micros() as libc::suseconds_t,
                 };
                 if timeout.tv_sec == 0 && timeout.tv_usec == 0 {
                     timeout.tv_usec = 1;