Kieran/ipnetwork
1
0
Fork 0
mirror of https://github.com/achanda/ipnetwork.git synced 2025-06-15 08:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run cargo fmt

Browse Source
This commit is contained in:
Abhishek Chanda
2020-01-05 11:38:28 +00:00
parent 986ee0ba1c
commit 18677e3b69
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ipv4.rs
View File

@ -64,7 +64,10 @@ impl Ipv4Network {
pub fn iter(&self) -> Ipv4NetworkIterator {
let start = u32::from(self.network());
let end = start + (self.size() - 1);
Ipv4NetworkIterator { next: Some(start), end }
Ipv4NetworkIterator {
next: Some(start),
end,
}
}
pub fn ip(&self) -> Ipv4Addr {
@ -244,7 +247,7 @@ impl FromStr for Ipv4Network {
} else {
parse_prefix(v, IPV4_BITS)?
}
},
}
None => IPV4_BITS,
};
Ipv4Network::new(addr, prefix)
@ -485,7 +488,10 @@ mod test {
#[test]
fn parse_netmask_broken_v4() {
assert_eq!("192.168.1.0/255.0.255.0".parse::<Ipv4Network>(), Err(IpNetworkError::InvalidPrefix));
assert_eq!(
"192.168.1.0/255.0.255.0".parse::<Ipv4Network>(),
Err(IpNetworkError::InvalidPrefix)
);
}
#[test]
@ -647,6 +653,9 @@ mod test {
let high_addrs: Vec<Ipv4Addr> = high.iter().collect();
assert_eq!(256, high_addrs.len());
assert_eq!("255.255.255.0".parse::<Ipv4Addr>().unwrap(), high_addrs[0]);
assert_eq!("255.255.255.255".parse::<Ipv4Addr>().unwrap(), high_addrs[255]);
assert_eq!(
"255.255.255.255".parse::<Ipv4Addr>().unwrap(),
high_addrs[255]
);
}
}

9
src/ipv6.rs
View File

@ -311,7 +311,10 @@ mod test {
#[test]
fn parse_netmask_broken_v6() {
assert_eq!("FF01:0:0:17:0:0:0:2/255.255.255.0".parse::<Ipv6Network>(), Err(IpNetworkError::InvalidPrefix));
assert_eq!(
"FF01:0:0:17:0:0:0:2/255.255.255.0".parse::<Ipv6Network>(),
Err(IpNetworkError::InvalidPrefix)
);
}
#[test]
@ -602,7 +605,9 @@ mod test {
let low_addrs: Vec<Ipv6Addr> = low.iter().collect();
assert_eq!(256, low_addrs.len());
let high: Ipv6Network = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ff00/120".parse().unwrap();
let high: Ipv6Network = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ff00/120"
.parse()
.unwrap();
let high_addrs: Vec<Ipv6Addr> = high.iter().collect();
assert_eq!(256, high_addrs.len());
}

4
src/lib.rs
View File

@ -13,10 +13,10 @@ mod ipv4;
mod ipv6;
pub use crate::common::IpNetworkError;
pub use crate::ipv4::{ipv4_mask_to_prefix, Ipv4Network};
pub use crate::ipv6::{ipv6_mask_to_prefix, Ipv6Network};
use crate::ipv4::Ipv4NetworkIterator;
pub use crate::ipv4::{ipv4_mask_to_prefix, Ipv4Network};
use crate::ipv6::Ipv6NetworkIterator;
pub use crate::ipv6::{ipv6_mask_to_prefix, Ipv6Network};
/// Represents a generic network range. This type can have two variants:
/// the v4 and the v6 case.