Use the new ? operator

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

View File

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