about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorLinus Färnstrand <faern@faern.net>2018-08-06 15:51:11 +0200
committerLinus Färnstrand <faern@faern.net>2018-08-08 10:52:10 +0200
commit83464591ed4ece724617e490838c23b0aae4b0ac (patch)
tree288918402e323d012d0e18672de895e01422ad80 /src/libstd
parentd45a703a746ff6245af3fa524d1620f104b8db0a (diff)
downloadrust-83464591ed4ece724617e490838c23b0aae4b0ac.tar.gz
rust-83464591ed4ece724617e490838c23b0aae4b0ac.zip
Simplify Ipv6Addr::from(octets) to not use unsafe
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/net/ip.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs
index 341757aeb75..d601a0c42e9 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)
     }
 }