Commit0785381

authored

Merge pull request#1183 from rs-sac/upstream

Add support for cidr 0.3 under separate feature

2 parents263fb90 +eea7f13 commit0785381Copy full SHA for 0785381

File tree

+48

-0

lines changed

+48

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ array-impls = ["array-init"]`
`16`	`16`	`js = ["postgres-protocol/js"]`
`17`	`17`	`with-bit-vec-0_6 = ["bit-vec-06"]`
`18`	`18`	`with-cidr-0_2 = ["cidr-02"]`
	`19`	`+with-cidr-0_3 = ["cidr-03"]`
`19`	`20`	`with-chrono-0_4 = ["chrono-04"]`
`20`	`21`	`with-eui48-0_4 = ["eui48-04"]`
`21`	`22`	`with-eui48-1 = ["eui48-1"]`
`@@ -41,6 +42,7 @@ chrono-04 = { version = "0.4.16", package = "chrono", default-features = false,`
`41`	`42`	`"clock",`
`42`	`43`	`],optional =true }`
`43`	`44`	`cidr-02 = {version ="0.2",package ="cidr",optional =true }`
	`45`	`+cidr-03 = {version ="0.3",package ="cidr",optional =true }`
`44`	`46`	`# eui48-04 will stop compiling and support will be removed`
`45`	`47`	`# See https://github.com/sfackler/rust-postgres/issues/1073`
`46`	`48`	`eui48-04 = {version ="0.4",package ="eui48",optional =true }`

Lines changed: 44 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,44 @@`
	`1`	`+use bytes::BytesMut;`
	`2`	`+use cidr_03::{IpCidr,IpInet};`
	`3`	`+use postgres_protocol::types;`
	`4`	`+use std::error::Error;`
	`5`	`+`
	`6`	`+usecrate::{FromSql,IsNull,ToSql,Type};`
	`7`	`+`
	`8`	`+impl<'a>FromSql<'a>forIpCidr{`
	`9`	`+fnfrom_sql(_:&Type,raw:&[u8]) ->Result<Self,Box<dynError +Sync +Send>>{`
	`10`	`+let inet = types::inet_from_sql(raw)?;`
	`11`	`+Ok(IpCidr::new(inet.addr(), inet.netmask())?)`
	`12`	`+}`
	`13`	`+`
	`14`	`+accepts!(CIDR);`
	`15`	`+}`
	`16`	`+`
	`17`	`+implToSqlforIpCidr{`
	`18`	`+fnto_sql(&self, _:&Type,w:&mutBytesMut) ->Result<IsNull,Box<dynError +Sync +Send>>{`
	`19`	`+ types::inet_to_sql(self.first_address(),self.network_length(), w);`
	`20`	`+Ok(IsNull::No)`
	`21`	`+}`
	`22`	`+`
	`23`	`+accepts!(CIDR);`
	`24`	`+to_sql_checked!();`
	`25`	`+}`
	`26`	`+`
	`27`	`+impl<'a>FromSql<'a>forIpInet{`
	`28`	`+fnfrom_sql(_:&Type,raw:&[u8]) ->Result<Self,Box<dynError +Sync +Send>>{`
	`29`	`+let inet = types::inet_from_sql(raw)?;`
	`30`	`+Ok(IpInet::new(inet.addr(), inet.netmask())?)`
	`31`	`+}`
	`32`	`+`
	`33`	`+accepts!(INET);`
	`34`	`+}`
	`35`	`+`
	`36`	`+implToSqlforIpInet{`
	`37`	`+fnto_sql(&self, _:&Type,w:&mutBytesMut) ->Result<IsNull,Box<dynError +Sync +Send>>{`
	`38`	`+ types::inet_to_sql(self.address(),self.network_length(), w);`
	`39`	`+Ok(IsNull::No)`
	`40`	`+}`
	`41`	`+`
	`42`	`+accepts!(INET);`
	`43`	`+to_sql_checked!();`
	`44`	`+}`

Lines changed: 2 additions & 0 deletions

Comments

(0)