ktims/rs-aggregate
1
0
Fork 0
mirror of https://github.com/ktims/rs-aggregate.git synced 2024-11-15 23:27:18 -08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary allocations in error handling

Browse Source
This commit is contained in:
Keenan Tims 2023-11-16 18:59:29 -08:00
parent 28bf3b5e10
commit 56ad01e74c
Signed by: ktims
GPG Key ID: 11230674D69038D4
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/iputils.rs
View File

@ -63,7 +63,7 @@ pub struct IpOrNet(IpNet);
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct NetParseError { pub struct NetParseError {
#[allow(dead_code)] #[allow(dead_code)]
msg: String, msg: &'static str,
} }
impl Display for NetParseError { impl Display for NetParseError {
@ -87,7 +87,7 @@ impl IpOrNet {
Ok(lead_ones.try_into()?) Ok(lead_ones.try_into()?)
} else { } else {
Err(Box::new(NetParseError { Err(Box::new(NetParseError {
msg: "Invalid subnet mask".to_owned(), msg: "Invalid subnet mask",
})) }))
} }
} else { } else {
@ -96,7 +96,7 @@ impl IpOrNet {
Ok(lead_zeros.try_into()?) Ok(lead_zeros.try_into()?)
} else { } else {
Err(Box::new(NetParseError { Err(Box::new(NetParseError {
msg: "Invalid wildcard mask".to_owned(), msg: "Invalid wildcard mask",
})) }))
} }
} }
@ -113,7 +113,7 @@ impl IpOrNet {
Ok(IpNet::new(ip, IpOrNet::parse_mask(pfxlen)?)?.into()) Ok(IpNet::new(ip, IpOrNet::parse_mask(pfxlen)?)?.into())
} else { } else {
Err(Box::new(NetParseError { Err(Box::new(NetParseError {
msg: "Mask form is not valid for IPv6 address".to_owned(), msg: "Mask form is not valid for IPv6 address",
})) }))
} }
} }
@ -209,7 +209,7 @@ impl Default for PrefixlenPair {
impl Display for PrefixlenPair { impl Display for PrefixlenPair {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.write_str(format!("{},{}", self.v4, self.v6).as_str()) f.write_fmt(format_args!("{},{}", self.v4, self.v6))
} }
} }
@ -263,12 +263,12 @@ impl PartialOrd<IpOrNet> for PrefixlenPair {
#[derive(Debug)] #[derive(Debug)]
pub struct ParsePrefixlenError { pub struct ParsePrefixlenError {
msg: String, msg: &'static str,
} }
impl Display for ParsePrefixlenError { impl Display for ParsePrefixlenError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.write_str(self.msg.as_str()) f.write_str(self.msg)
} }
} }
@ -280,25 +280,25 @@ impl FromStr for PrefixlenPair {
match s.split_once(',') { match s.split_once(',') {
Some(pair) => { Some(pair) => {
let v4 = u8::from_str(pair.0).or(Err(ParsePrefixlenError { let v4 = u8::from_str(pair.0).or(Err(ParsePrefixlenError {
msg: "Unable to parse integer".to_owned(), msg: "Unable to parse integer",
}))?; }))?;
let v6 = u8::from_str(pair.1).or(Err(ParsePrefixlenError { let v6 = u8::from_str(pair.1).or(Err(ParsePrefixlenError {
msg: "Unable to parse integer".to_owned(), msg: "Unable to parse integer",
}))?; }))?;
if v4 > 32 || v6 > 128 { if v4 > 32 || v6 > 128 {
return Err(ParsePrefixlenError { return Err(ParsePrefixlenError {
msg: "Invalid prefix length".to_owned(), msg: "Invalid prefix length",
}); });
} }
Ok(PrefixlenPair { v4, v6 }) Ok(PrefixlenPair { v4, v6 })
} }
None => { None => {
let len = u8::from_str(s).or(Err(ParsePrefixlenError { let len = u8::from_str(s).or(Err(ParsePrefixlenError {
msg: "Unable to parse integer".to_owned(), msg: "Unable to parse integer",
}))?; }))?;
if len > 128 { if len > 128 {
return Err(ParsePrefixlenError { return Err(ParsePrefixlenError {
msg: "Invalid prefix length".to_owned(), msg: "Invalid prefix length",
}); });
} }
Ok(PrefixlenPair { v4: len, v6: len }) Ok(PrefixlenPair { v4: len, v6: len })