diff options
author | Carl Lerche <me@carllerche.com> | 2020-10-08 12:12:56 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-08 12:12:56 -0700 |
commit | 066965cd59d01fd9d999152e32169a24dfe434fa (patch) | |
tree | eef03ca071b8d9f285954a1f98fd85e3e188c98b /tokio/tests/tcp_connect.rs | |
parent | 6259893094ebcdfecb107fcf3682eaad1bd1903b (diff) |
net: use &self with TcpListener::accept (#2919)
Uses the infrastructure added by #2828 to enable switching
`TcpListener::accept` to use `&self`.
This also switches `poll_accept` to use `&self`. While doing introduces
a hazard, `poll_*` style functions are considered low-level. Most users
will use the `async fn` variants which are more misuse-resistant.
TcpListener::incoming() is temporarily removed as it has the same
problem as `TcpSocket::by_ref()` and will be implemented later.
Diffstat (limited to 'tokio/tests/tcp_connect.rs')
-rw-r--r-- | tokio/tests/tcp_connect.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tokio/tests/tcp_connect.rs b/tokio/tests/tcp_connect.rs index de1cead8..44942c4e 100644 --- a/tokio/tests/tcp_connect.rs +++ b/tokio/tests/tcp_connect.rs @@ -9,7 +9,7 @@ use futures::join; #[tokio::test] async fn connect_v4() { - let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await); + let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await); let addr = assert_ok!(srv.local_addr()); assert!(addr.is_ipv4()); @@ -36,7 +36,7 @@ async fn connect_v4() { #[tokio::test] async fn connect_v6() { - let mut srv = assert_ok!(TcpListener::bind("[::1]:0").await); + let srv = assert_ok!(TcpListener::bind("[::1]:0").await); let addr = assert_ok!(srv.local_addr()); assert!(addr.is_ipv6()); @@ -63,7 +63,7 @@ async fn connect_v6() { #[tokio::test] async fn connect_addr_ip_string() { - let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await); + let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await); let addr = assert_ok!(srv.local_addr()); let addr = format!("127.0.0.1:{}", addr.port()); @@ -80,7 +80,7 @@ async fn connect_addr_ip_string() { #[tokio::test] async fn connect_addr_ip_str_slice() { - let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await); + let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await); let addr = assert_ok!(srv.local_addr()); let addr = format!("127.0.0.1:{}", addr.port()); @@ -97,7 +97,7 @@ async fn connect_addr_ip_str_slice() { #[tokio::test] async fn connect_addr_host_string() { - let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await); + let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await); let addr = assert_ok!(srv.local_addr()); let addr = format!("localhost:{}", addr.port()); @@ -114,7 +114,7 @@ async fn connect_addr_host_string() { #[tokio::test] async fn connect_addr_ip_port_tuple() { - let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await); + let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await); let addr = assert_ok!(srv.local_addr()); let addr = (addr.ip(), addr.port()); @@ -131,7 +131,7 @@ async fn connect_addr_ip_port_tuple() { #[tokio::test] async fn connect_addr_ip_str_port_tuple() { - let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await); + let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await); let addr = assert_ok!(srv.local_addr()); let addr = ("127.0.0.1", addr.port()); @@ -148,7 +148,7 @@ async fn connect_addr_ip_str_port_tuple() { #[tokio::test] async fn connect_addr_host_str_port_tuple() { - let mut srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await); + let srv = assert_ok!(TcpListener::bind("127.0.0.1:0").await); let addr = assert_ok!(srv.local_addr()); let addr = ("localhost", addr.port()); |