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

Clean up some things as reported by clippy

Browse Source
This commit is contained in:
Abhishek Chanda
2016-12-21 09:46:32 +00:00
parent 21dfeaccfc
commit 021bb38573
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common.rs
View File

@ -7,7 +7,7 @@ pub enum IpNetworkError {
InvalidCidrFormat(String), InvalidCidrFormat(String),
} }
pub fn cidr_parts<'a>(cidr: &'a str) -> Result<(&'a str, &'a str), IpNetworkError> { pub fn cidr_parts(cidr: &str) -> Result<(&str, &str), IpNetworkError> {
let parts = cidr.split('/').collect::<Vec<&str>>(); let parts = cidr.split('/').collect::<Vec<&str>>();
if parts.len() == 2 { if parts.len() == 2 {
Ok((parts[0], parts[1])) Ok((parts[0], parts[1]))

3
src/ipv4.rs
View File

@ -341,8 +341,7 @@ mod test {
let mut map = HashMap::new(); let mut map = HashMap::new();
let net = Ipv4Network::new(Ipv4Addr::new(127, 0, 0, 1), 16).unwrap(); let net = Ipv4Network::new(Ipv4Addr::new(127, 0, 0, 1), 16).unwrap();
map.insert(net, 137); map.insert(net, 137);
let out = map.get(&net).unwrap(); assert_eq!(137, map[&net]);
assert_eq!(137, *out);
} }
#[test] #[test]

3
src/ipv6.rs
View File

@ -83,8 +83,7 @@ impl FromStr for Ipv6Network {
type Err = IpNetworkError; type Err = IpNetworkError;
fn from_str(s: &str) -> Result<Ipv6Network, IpNetworkError> { fn from_str(s: &str) -> Result<Ipv6Network, IpNetworkError> {
let (addr_str, prefix_str) = cidr_parts(s)?; let (addr_str, prefix_str) = cidr_parts(s)?;
let addr = Ipv6Addr::from_str(addr_str) let addr = Ipv6Addr::from_str(addr_str).map_err(|_| IpNetworkError::InvalidAddr(addr_str.to_string()))?;
.map_err(|_| IpNetworkError::InvalidAddr(format!("{}", addr_str)))?;
let prefix = parse_prefix(prefix_str, IPV6_BITS)?; let prefix = parse_prefix(prefix_str, IPV6_BITS)?;
Ipv6Network::new(addr, prefix) Ipv6Network::new(addr, prefix)
} }