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

Implement TryFrom<&str> for all basic types

Browse Source 
Also improve some docs and FromStr type signature
Closes #135
This commit is contained in:
Abhishek Chanda
2020-08-09 22:27:49 +01:00
parent 0b98eecf6a
commit e15e8cb812
3 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ipv4.rs
View File

@ -1,5 +1,5 @@
use crate::common::{cidr_parts, parse_prefix, IpNetworkError};
use std::{fmt, net::Ipv4Addr, str::FromStr};
use std::{fmt, net::Ipv4Addr, str::FromStr, convert::TryFrom};
const IPV4_BITS: u8 = 32;
@ -236,7 +236,7 @@ impl fmt::Display for Ipv4Network {
/// ```
impl FromStr for Ipv4Network {
type Err = IpNetworkError;
fn from_str(s: &str) -> Result<Ipv4Network, IpNetworkError> {
fn from_str(s: &str) -> Result<Self, Self::Err> {
let (addr_str, prefix_str) = cidr_parts(s)?;
let addr = Ipv4Addr::from_str(addr_str)
.map_err(|_| IpNetworkError::InvalidAddr(addr_str.to_string()))?;
@ -254,6 +254,14 @@ impl FromStr for Ipv4Network {
}
}
impl TryFrom<&str> for Ipv4Network {
type Error = IpNetworkError;
fn try_from(s: &str) -> Result<Self, Self::Error> {
Ipv4Network::from_str(s)
}
}
impl From<Ipv4Addr> for Ipv4Network {
fn from(a: Ipv4Addr) -> Ipv4Network {
Ipv4Network {