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

Use the new ? operator

Browse Source
This commit is contained in:
Abhishek Chanda
2016-12-08 12:07:34 +00:00
parent c77e351fb0
commit d368d2bf02
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ipv4.rs
View File

@ -175,9 +175,9 @@ impl Ipv4Network {
if i >= 4 {
return Err(IpNetworkError::InvalidAddr(format!("More than 4 bytes: {}", addr)));
}
bytes[i] = try!(byte.map_err(|_| {
bytes[i] = byte.map_err(|_| {
IpNetworkError::InvalidAddr(format!("All bytes not 0-255: {}", addr))
}));
})?;
}
Ok(Ipv4Addr::new(bytes[0], bytes[1], bytes[2], bytes[3]))
}
@ -206,9 +206,9 @@ impl fmt::Display for Ipv4Network {
impl FromStr for Ipv4Network {
type Err = IpNetworkError;
fn from_str(s: &str) -> Result<Ipv4Network, IpNetworkError> {
let (addr_str, prefix_str) = try!(cidr_parts(s));
let addr = try!(parse_addr(addr_str));
let prefix = try!(parse_prefix(prefix_str, IPV4_BITS));
let (addr_str, prefix_str) = cidr_parts(s)?;
let addr = parse_addr(addr_str)?;
let prefix = parse_prefix(prefix_str, IPV4_BITS)?;
Ipv4Network::new(addr, prefix)
}
}