dnim/rust-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change error handling in cidr FromSql implementations

Browse Source
This commit is contained in:
Tim Anderson 2022-03-17 09:31:13 +10:00
parent dd7bc073f7
commit 27039f6c3a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
postgres-types/src/cidr_02.rs
View File

@ -8,8 +8,7 @@ use crate::{FromSql, IsNull, ToSql, Type};
impl<'a> FromSql<'a> for IpCidr {
fn from_sql(_: &Type, raw: &[u8]) -> Result<Self, Box<dyn Error + Sync + Send>> {
let inet = types::inet_from_sql(raw)?;
Ok(IpCidr::new(inet.addr(), inet.netmask())
.expect("postgres cidr type has zeroed host portion"))
Ok(IpCidr::new(inet.addr(), inet.netmask())?)
}
accepts!(CIDR);
@ -28,8 +27,7 @@ impl ToSql for IpCidr {
impl<'a> FromSql<'a> for IpInet {
fn from_sql(_: &Type, raw: &[u8]) -> Result<Self, Box<dyn Error + Sync + Send>> {
let inet = types::inet_from_sql(raw)?;
Ok(IpInet::new(inet.addr(), inet.netmask())
.expect("postgres enforces maximum length of netmask"))
Ok(IpInet::new(inet.addr(), inet.netmask())?)
}
accepts!(INET);