From 2286d587289a4362da80f3880a22d83f216979c9 Mon Sep 17 00:00:00 2001
From: sharks <sharks@localhost.localdomain>
Date: Tue, 17 Apr 2018 19:28:45 -0500
Subject: [PATCH] cargo fmt and clippy

---
 src/ipv4.rs | 12 +++---------
 src/ipv6.rs |  5 +----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/ipv4.rs b/src/ipv4.rs
index 52af26f..8295890 100644
--- a/src/ipv4.rs
+++ b/src/ipv4.rs
@@ -41,10 +41,7 @@ impl Ipv4Network {
         if prefix > IPV4_BITS {
             Err(IpNetworkError::InvalidPrefix)
         } else {
-            Ok(Ipv4Network {
-                addr: addr,
-                prefix: prefix,
-            })
+            Ok(Ipv4Network { addr, prefix })
         }
     }
 
@@ -54,10 +51,7 @@ impl Ipv4Network {
     pub fn iter(&self) -> Ipv4NetworkIterator {
         let start = u64::from(u32::from(self.network()));
         let end = start + self.size();
-        Ipv4NetworkIterator {
-            next: start,
-            end: end,
-        }
+        Ipv4NetworkIterator { next: start, end }
     }
 
     pub fn ip(&self) -> Ipv4Addr {
@@ -254,7 +248,7 @@ pub fn ipv4_mask_to_prefix(mask: Ipv4Addr) -> Result<u8, IpNetworkError> {
     let mask = u32::from(mask);
 
     let prefix = (!mask).leading_zeros() as u8;
-    if ((mask as u64) << prefix) & 0xffff_ffff != 0 {
+    if (u64::from(mask) << prefix) & 0xffff_ffff != 0 {
         Err(IpNetworkError::InvalidPrefix)
     } else {
         Ok(prefix)
diff --git a/src/ipv6.rs b/src/ipv6.rs
index d7ec53c..4f272ba 100644
--- a/src/ipv6.rs
+++ b/src/ipv6.rs
@@ -43,10 +43,7 @@ impl Ipv6Network {
         if prefix > IPV6_BITS {
             Err(IpNetworkError::InvalidPrefix)
         } else {
-            Ok(Ipv6Network {
-                addr: addr,
-                prefix: prefix,
-            })
+            Ok(Ipv6Network { addr, prefix })
         }
     }