Do not call new for iterators

JakubOnderka · Jul 11, 2021 · 47814c1 · 47814c1
1 parent c4845a3
commit 47814c1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/ipv4_network.rs b/src/ipv4_network.rs
@@ -12,8 +12,8 @@ use std::collections::btree_map::Entry;
 /// IPv4 Network.
 #[derive(Clone, Copy, Debug, Eq, PartialOrd, Ord)]
 pub struct Ipv4Network {
-    network_address: Ipv4Addr,
-    netmask: u8,
+    pub(crate) network_address: Ipv4Addr,
+    pub(crate) netmask: u8,
 }
 
 impl Ipv4Network {

diff --git a/src/ipv6_network.rs b/src/ipv6_network.rs
@@ -23,8 +23,8 @@ pub enum Ipv6MulticastScope {
 /// IPv6 Network.
 #[derive(Clone, Copy, Debug, Eq, PartialOrd, Ord)]
 pub struct Ipv6Network {
-    network_address: Ipv6Addr,
-    netmask: u8,
+    pub(crate) network_address: Ipv6Addr,
+    pub(crate) netmask: u8,
 }
 
 impl Ipv6Network {

diff --git a/src/iterator.rs b/src/iterator.rs
@@ -158,7 +158,10 @@ impl Iterator for Ipv4NetworkIterator {
                 None => self.is_done = true,
             };
 
-            Some(Self::Item::new(Ipv4Addr::from(output), self.new_netmask).unwrap())
+            Some(Self::Item {
+                network_address: Ipv4Addr::from(output),
+                netmask: self.new_netmask,
+            })
         } else {
             None
         }
@@ -244,7 +247,10 @@ impl Iterator for Ipv6NetworkIterator {
                 None => self.is_done = true,
             };
 
-            Some(Self::Item::new(Ipv6Addr::from(output), self.new_netmask).unwrap())
+            Some(Self::Item {
+                network_address: Ipv6Addr::from(output),
+                netmask: self.new_netmask,
+            })
         } else {
             None
         }
@@ -254,7 +260,7 @@ impl Iterator for Ipv6NetworkIterator {
         let remaining = self.real_len();
 
         if 128 - remaining.leading_zeros() > POINTER_WIDTH {
-            (::std::usize::MAX, None)
+            (usize::MAX, None)
         } else {
             let remaining_u64 = remaining as u64;
             (remaining_u64 as usize, Some(remaining_u64 as usize))
@@ -368,7 +374,7 @@ mod tests {
         let network = Ipv6Network::new(ip, 0).unwrap();
         let iterator = Ipv6NetworkIterator::new(network, 128);
 
-        assert_eq!(iterator.real_len(), u128::max_value());
+        assert_eq!(iterator.real_len(), u128::MAX);
     }
 
     #[test]