]> git.lizzy.rs Git - rust.git/commitdiff
Use `Ipv4Addr::from<[u8; 4]>` when possible
authorLzu Tao <taolzu@gmail.com>
Tue, 16 Jun 2020 01:54:17 +0000 (01:54 +0000)
committerLzu Tao <taolzu@gmail.com>
Tue, 16 Jun 2020 01:54:17 +0000 (01:54 +0000)
src/libstd/sys/hermit/net.rs

index 9e588c4265ac2199784ba0393e8a43c850904ca0..8a788a9265f63c224dde07486812c60b8c127284 100644 (file)
@@ -147,10 +147,7 @@ pub fn peer_addr(&self) -> io::Result<SocketAddr> {
             .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 @@ pub fn accept(&self) -> io::Result<(TcpStream, SocketAddr)> {
         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"));