diff options
| author | Stefan Lankes <slankes@eonerc.rwth-aachen.de> | 2020-06-15 08:53:58 +0200 |
|---|---|---|
| committer | Stefan Lankes <slankes@eonerc.rwth-aachen.de> | 2020-06-15 08:53:58 +0200 |
| commit | 6c983a733550ff37cb603f409901f3b3d0eaa8c2 (patch) | |
| tree | 55d99b306c5def99a8e533cebc34121c62f69ea7 | |
| parent | 9c9f21fb23ae59012e7aba162e1105d26fcd119b (diff) | |
| download | rust-6c983a733550ff37cb603f409901f3b3d0eaa8c2.tar.gz rust-6c983a733550ff37cb603f409901f3b3d0eaa8c2.zip | |
use Ipv6Addr::from to build the IPv6 address
| -rw-r--r-- | src/libstd/sys/hermit/net.rs | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/src/libstd/sys/hermit/net.rs b/src/libstd/sys/hermit/net.rs index a02f1131329..6410dec756d 100644 --- a/src/libstd/sys/hermit/net.rs +++ b/src/libstd/sys/hermit/net.rs @@ -148,18 +148,7 @@ impl TcpStream { IpAddr::V4(Ipv4Addr::new(addr.0[0], addr.0[1], addr.0[2], addr.0[3])), port, ), - Ipv6(ref addr) => SocketAddr::new( - IpAddr::V6(Ipv6Addr::new( - ((addr.0[0] as u16) << 8) | addr.0[1] as u16, - ((addr.0[2] as u16) << 8) | addr.0[3] as u16, - ((addr.0[4] as u16) << 8) | addr.0[5] as u16, - ((addr.0[6] as u16) << 8) | addr.0[7] as u16, - ((addr.0[8] as u16) << 8) | addr.0[9] as u16, - ((addr.0[10] as u16) << 8) | addr.0[11] as u16, - ((addr.0[12] as u16) << 8) | addr.0[13] as u16, - ((addr.0[14] as u16) << 8) | addr.0[15] as u16)), - port, - ), + Ipv6(ref addr) => SocketAddr::new(IpAddr::V6(Ipv6Addr::from(addr.0)), port), _ => { return Err(io::Error::new(ErrorKind::Other, "peer_addr failed")); }, @@ -239,18 +228,7 @@ impl TcpListener { IpAddr::V4(Ipv4Addr::new(addr.0[0], addr.0[1], addr.0[2], addr.0[3])), port, ), - Ipv6(ref addr) => SocketAddr::new( - IpAddr::V6(Ipv6Addr::new( - ((addr.0[0] as u16) << 8) | addr.0[1] as u16, - ((addr.0[2] as u16) << 8) | addr.0[3] as u16, - ((addr.0[4] as u16) << 8) | addr.0[5] as u16, - ((addr.0[6] as u16) << 8) | addr.0[7] as u16, - ((addr.0[8] as u16) << 8) | addr.0[9] as u16, - ((addr.0[10] as u16) << 8) | addr.0[11] as u16, - ((addr.0[12] as u16) << 8) | addr.0[13] as u16, - ((addr.0[14] as u16) << 8) | addr.0[15] as u16)), - port, - ), + Ipv6(ref addr) => SocketAddr::new(IpAddr::V6(Ipv6Addr::from(addr.0)), port), _ => { return Err(io::Error::new(ErrorKind::Other, "accept failed")); }, |