diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-06-16 15:08:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 15:08:47 +0200 |
| commit | 3c437e5733babe67ccdfa6c5928878e1b039228e (patch) | |
| tree | 1918e4b75998bd99dbe709743785827a6d3ff54b | |
| parent | 759547b210ddacc2c0c6df6d86fb9306fb27a660 (diff) | |
| parent | 0e6c333ca61d3f04ad142a2929d03cb8ecd2a706 (diff) | |
| download | rust-3c437e5733babe67ccdfa6c5928878e1b039228e.tar.gz rust-3c437e5733babe67ccdfa6c5928878e1b039228e.zip | |
Rollup merge of #73389 - lzutao:from, r=kennytm
Use `Ipv4Addr::from<[u8; 4]>` when possible Resolve this comment: https://github.com/rust-lang/rust/pull/73331#discussion_r440098369
| -rw-r--r-- | src/libstd/sys/hermit/net.rs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/libstd/sys/hermit/net.rs b/src/libstd/sys/hermit/net.rs index 9e588c4265a..8a788a9265f 100644 --- a/src/libstd/sys/hermit/net.rs +++ b/src/libstd/sys/hermit/net.rs @@ -147,10 +147,7 @@ impl TcpStream { .map_err(|_| io::Error::new(ErrorKind::Other, "peer_addr failed"))?; let saddr = match ipaddr { - Ipv4(ref addr) => SocketAddr::new( - IpAddr::V4(Ipv4Addr::new(addr.0[0], addr.0[1], addr.0[2], addr.0[3])), - port, - ), + Ipv4(ref addr) => SocketAddr::new(IpAddr::V4(Ipv4Addr::from(addr.0)), port), Ipv6(ref addr) => SocketAddr::new(IpAddr::V6(Ipv6Addr::from(addr.0)), port), _ => { return Err(io::Error::new(ErrorKind::Other, "peer_addr failed")); @@ -227,10 +224,7 @@ impl TcpListener { let (handle, ipaddr, port) = abi::tcplistener::accept(self.0.port()) .map_err(|_| io::Error::new(ErrorKind::Other, "accept failed"))?; let saddr = match ipaddr { - Ipv4(ref addr) => SocketAddr::new( - IpAddr::V4(Ipv4Addr::new(addr.0[0], addr.0[1], addr.0[2], addr.0[3])), - port, - ), + Ipv4(ref addr) => SocketAddr::new(IpAddr::V4(Ipv4Addr::from(addr.0)), port), Ipv6(ref addr) => SocketAddr::new(IpAddr::V6(Ipv6Addr::from(addr.0)), port), _ => { return Err(io::Error::new(ErrorKind::Other, "accept failed")); |