Update to the latest postgres

Author: dovahcrow

Cargo.toml

@@ -1,20 +1,16 @@
 [package]
 name = "postgres_range"
-version = "0.8.2"
+version = "0.9.0"
 authors = ["Steven Fackler <[email protected]>"]
 license = "MIT"
 description = "Range support for rust-postgres"
 repository = "https://github.com/sfackler/rust-postgres-range"
-documentation = "https://sfackler.github.io/rust-postgres-range/doc/v0.8.2/postgres_range"
+documentation = "https://sfackler.github.io/rust-postgres-range/doc/v0.9.0/postgres_range"
 
 [dependencies]
 time = "0.1"
-postgres = "0.11"
-postgres-protocol = {git = "https://github.com/sfackler/rust-postgres-protocol" }
+postgres = "0.15"
+postgres-protocol = "0.3"
 
 [dev-dependencies]
-postgres ={version = "0.11", features = ["with-time"] }
-
-[replace]
-"postgres:0.11.11" ={git = "https://github.com/sfackler/rust-postgres" }
-"fallible-iterator:0.1.2" ={git = "https://github.com/sfackler/rust-fallible-iterator" }
+postgres ={version = "0.15", features = ["with-time"] }

src/impls.rs

@@ -1,11 +1,11 @@
 use std::error::Error;
-use postgres::types::{Type,Kind,ToSql,FromSql,IsNull,SessionInfo};
-use postgres_protocol::types;
+use postgres::types::{Type,Kind,ToSql,FromSql,IsNull};
+use postgres_protocol::{selfas protocol,types};
 
 use{Range,RangeBound,BoundType,BoundSided,Normalizable};
 
 impl<T>FromSqlforRange<T>whereT:PartialOrd+Normalizable+FromSql{
-fnfrom_sql(ty:&Type,raw:&[u8],info:&SessionInfo) -> Result<Range<T>,Box<Error + Sync + Send>>{
+fnfrom_sql(ty:&Type,raw:&[u8]) -> Result<Range<T>,Box<Error + Sync + Send>>{
 let element_type = match ty.kind(){
 &Kind::Range(ref ty) => ty,
  _ => panic!("unexpected type{:?}", ty)
@@ -14,8 +14,8 @@ impl<T> FromSql for Range<T> where T: PartialOrd+Normalizable+FromSql{
 match try!(types::range_from_sql(raw)){
  types::Range::Empty => Ok(Range::empty()),
  types::Range::Nonempty(lower, upper) => {
-let lower = try!(bound_from_sql(lower, element_type, info));
-let upper = try!(bound_from_sql(upper, element_type, info));
+let lower = try!(bound_from_sql(lower, element_type));
+let upper = try!(bound_from_sql(upper, element_type));
 Ok(Range::new(lower, upper))
 }
 }
@@ -29,22 +29,22 @@ impl<T> FromSql for Range<T> where T: PartialOrd+Normalizable+FromSql{
 }
 }
 
-fnbound_from_sql<T,S>(bound: types::RangeBound<Option<&[u8]>>,ty:&Type,info:&SessionInfo) -> Result<Option<RangeBound<S,T>>,Box<Error + Sync + Send>>
+fnbound_from_sql<T,S>(bound: types::RangeBound<Option<&[u8]>>,ty:&Type) -> Result<Option<RangeBound<S,T>>,Box<Error + Sync + Send>>
 whereT:PartialOrd + Normalizable + FromSql,
 S:BoundSided
 {
 match bound {
  types::RangeBound::Exclusive(value) => {
 let value = match value {
-Some(value) => try!(T::from_sql(ty, value, info)),
-None => try!(T::from_sql_null(ty, info)),
+Some(value) => try!(T::from_sql(ty, value)),
+None => try!(T::from_sql_null(ty)),
 };
 Ok(Some(RangeBound::new(value,BoundType::Exclusive)))
 },
  types::RangeBound::Inclusive(value) => {
 let value = match value {
-Some(value) => try!(T::from_sql(ty, value, info)),
-None => try!(T::from_sql_null(ty, info)),
+Some(value) => try!(T::from_sql(ty, value)),
+None => try!(T::from_sql_null(ty)),
 };
 Ok(Some(RangeBound::new(value,BoundType::Inclusive)))
 },
@@ -53,7 +53,7 @@ fn bound_from_sql<T, S>(bound: types::RangeBound<Option<&[u8]>>, ty: &Type, info
 }
 
 impl<T>ToSqlforRange<T>whereT:PartialOrd+Normalizable+ToSql{
-fnto_sql(&self,ty:&Type,mutbuf:&mutVec<u8>,info:&SessionInfo) -> Result<IsNull,Box<Error + Sync + Send>>{
+fnto_sql(&self,ty:&Type,buf:&mutVec<u8>) -> Result<IsNull,Box<Error + Sync + Send>>{
 let element_type = match ty.kind(){
 &Kind::Range(ref ty) => ty,
  _ => panic!("unexpected type{:?}", ty)
@@ -62,8 +62,8 @@ impl<T> ToSql for Range<T> where T: PartialOrd+Normalizable+ToSql{
 ifself.is_empty(){
  types::empty_range_to_sql(buf);
 }else{
- try!(types::range_to_sql(|buf| bound_to_sql(self.lower(), element_type,info,buf),
- |buf| bound_to_sql(self.upper(), element_type,info,buf),
+ try!(types::range_to_sql(|buf| bound_to_sql(self.lower(), element_type, buf),
+ |buf| bound_to_sql(self.upper(), element_type, buf),
  buf));
 }
 
@@ -80,15 +80,15 @@ impl<T> ToSql for Range<T> where T: PartialOrd+Normalizable+ToSql{
 to_sql_checked!();
 }
 
-fnbound_to_sql<S,T>(bound:Option<&RangeBound<S,T>>,ty:&Type,info:&SessionInfo,buf:&mutVec<u8>) -> Result<types::RangeBound<types::IsNull>,Box<Error + Sync + Send>>
+fnbound_to_sql<S,T>(bound:Option<&RangeBound<S,T>>,ty:&Type,buf:&mutVec<u8>) -> Result<types::RangeBound<protocol::IsNull>,Box<Error + Sync + Send>>
 whereS:BoundSided,
 T:ToSql
 {
 match bound {
 Some(bound) => {
-let null = match try!(bound.value.to_sql(ty, buf, info)){
-IsNull::Yes => types::IsNull::Yes,
-IsNull::No => types::IsNull::No,
+let null = match try!(bound.value.to_sql(ty, buf)){
+IsNull::Yes => protocol::IsNull::Yes,
+IsNull::No => protocol::IsNull::No,
 };
 
 match bound.type_{