Commit27039f6

committed

Change error handling incidrFromSql implementations

1 parentdd7bc07 commit27039f6Copy full SHA for 27039f6

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@ use crate::{FromSql, IsNull, ToSql, Type};`
`8`	`8`	`impl<'a>FromSql<'a>forIpCidr{`
`9`	`9`	`fnfrom_sql(_:&Type,raw:&[u8]) ->Result<Self,Box<dynError +Sync +Send>>{`
`10`	`10`	`let inet = types::inet_from_sql(raw)?;`
`11`		`-Ok(IpCidr::new(inet.addr(), inet.netmask())`
`12`		`-.expect("postgres cidr type has zeroed host portion"))`
	`11`	`+Ok(IpCidr::new(inet.addr(), inet.netmask())?)`
`13`	`12`	`}`
`14`	`13`
`15`	`14`	`accepts!(CIDR);`
`@@ -28,8 +27,7 @@ impl ToSql for IpCidr {`
`28`	`27`	`impl<'a>FromSql<'a>forIpInet{`
`29`	`28`	`fnfrom_sql(_:&Type,raw:&[u8]) ->Result<Self,Box<dynError +Sync +Send>>{`
`30`	`29`	`let inet = types::inet_from_sql(raw)?;`
`31`		`-Ok(IpInet::new(inet.addr(), inet.netmask())`
`32`		`-.expect("postgres enforces maximum length of netmask"))`
	`30`	`+Ok(IpInet::new(inet.addr(), inet.netmask())?)`
`33`	`31`	`}`
`34`	`32`
`35`	`33`	`accepts!(INET);`

Comments

(0)