Skip to content

Commit 6c983a7

Browse files
committed
use Ipv6Addr::from to build the IPv6 address
1 parent 9c9f21f commit 6c983a7

File tree

1 file changed

+2
-24
lines changed

1 file changed

+2
-24
lines changed

src/libstd/sys/hermit/net.rs

+2-24
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,7 @@ impl TcpStream {
148148
IpAddr::V4(Ipv4Addr::new(addr.0[0], addr.0[1], addr.0[2], addr.0[3])),
149149
port,
150150
),
151-
Ipv6(ref addr) => SocketAddr::new(
152-
IpAddr::V6(Ipv6Addr::new(
153-
((addr.0[0] as u16) << 8) | addr.0[1] as u16,
154-
((addr.0[2] as u16) << 8) | addr.0[3] as u16,
155-
((addr.0[4] as u16) << 8) | addr.0[5] as u16,
156-
((addr.0[6] as u16) << 8) | addr.0[7] as u16,
157-
((addr.0[8] as u16) << 8) | addr.0[9] as u16,
158-
((addr.0[10] as u16) << 8) | addr.0[11] as u16,
159-
((addr.0[12] as u16) << 8) | addr.0[13] as u16,
160-
((addr.0[14] as u16) << 8) | addr.0[15] as u16)),
161-
port,
162-
),
151+
Ipv6(ref addr) => SocketAddr::new(IpAddr::V6(Ipv6Addr::from(addr.0)), port),
163152
_ => {
164153
return Err(io::Error::new(ErrorKind::Other, "peer_addr failed"));
165154
},
@@ -239,18 +228,7 @@ impl TcpListener {
239228
IpAddr::V4(Ipv4Addr::new(addr.0[0], addr.0[1], addr.0[2], addr.0[3])),
240229
port,
241230
),
242-
Ipv6(ref addr) => SocketAddr::new(
243-
IpAddr::V6(Ipv6Addr::new(
244-
((addr.0[0] as u16) << 8) | addr.0[1] as u16,
245-
((addr.0[2] as u16) << 8) | addr.0[3] as u16,
246-
((addr.0[4] as u16) << 8) | addr.0[5] as u16,
247-
((addr.0[6] as u16) << 8) | addr.0[7] as u16,
248-
((addr.0[8] as u16) << 8) | addr.0[9] as u16,
249-
((addr.0[10] as u16) << 8) | addr.0[11] as u16,
250-
((addr.0[12] as u16) << 8) | addr.0[13] as u16,
251-
((addr.0[14] as u16) << 8) | addr.0[15] as u16)),
252-
port,
253-
),
231+
Ipv6(ref addr) => SocketAddr::new(IpAddr::V6(Ipv6Addr::from(addr.0)), port),
254232
_ => {
255233
return Err(io::Error::new(ErrorKind::Other, "accept failed"));
256234
},

0 commit comments

Comments
 (0)