From 83464591ed4ece724617e490838c23b0aae4b0ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= <faern@faern.net>
Date: Mon, 6 Aug 2018 15:51:11 +0200
Subject: [PATCH] Simplify Ipv6Addr::from(octets) to not use unsafe

---
 src/libstd/net/ip.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs
index 341757aeb75a..d601a0c42e98 100644
--- a/src/libstd/net/ip.rs
+++ b/src/libstd/net/ip.rs
@@ -16,7 +16,6 @@
 use cmp::Ordering;
 use fmt;
 use hash;
-use mem;
 use sys::net::netc as c;
 use sys_common::{AsInner, FromInner};
 
@@ -1429,8 +1428,7 @@ impl From<u128> for Ipv6Addr {
 #[stable(feature = "ipv6_from_octets", since = "1.9.0")]
 impl From<[u8; 16]> for Ipv6Addr {
     fn from(octets: [u8; 16]) -> Ipv6Addr {
-        let mut inner: c::in6_addr = unsafe { mem::zeroed() };
-        inner.s6_addr = octets;
+        let inner = c::in6_addr { s6_addr: octets };
         Ipv6Addr::from_inner(inner)
     }
 }