about summary refs log tree commit diff
diff options
context:
space:
mode:
authorStefan Lankes <slankes@eonerc.rwth-aachen.de>2020-06-14 23:43:54 +0200
committerStefan Lankes <slankes@eonerc.rwth-aachen.de>2020-06-14 23:43:54 +0200
commitd221ffc68e543f4a38efcc2bd34f52145f89003b (patch)
treebf90f45808535d5d6172644249d87a1c79408a06
parentfd86a847206dd2333c23c768b8c0564e15a05c1c (diff)
downloadrust-d221ffc68e543f4a38efcc2bd34f52145f89003b.tar.gz
rust-d221ffc68e543f4a38efcc2bd34f52145f89003b.zip
simplify conversion to IpAddr::V6
-rw-r--r--src/libstd/sys/hermit/net.rs20
1 files changed, 2 insertions, 18 deletions
diff --git a/src/libstd/sys/hermit/net.rs b/src/libstd/sys/hermit/net.rs
index 70c010e6232..cba8d6aaca6 100644
--- a/src/libstd/sys/hermit/net.rs
+++ b/src/libstd/sys/hermit/net.rs
@@ -150,15 +150,7 @@ impl TcpStream {
                 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)),
+                IpAddr::V6(Ipv6Addr::new(addr.0)),
                 port,
             ),
             _ => {
@@ -241,15 +233,7 @@ impl TcpListener {
                 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)),
+                IpAddr::V6(Ipv6Addr::new(addr.0)),
                 port,
             ),
             _ => {