Merge pull request #11 from sfackler/no-postgres-dep

Cleanup

Author: sfackler

.travis.yml

@@ -2,8 +2,9 @@ language: rust
 rust:
 - nightly
 - beta
-- 1.20.0
+- 1.26.0
 addons:
 postgresql: 9.4
 script:
 - cargo test
+- cargo test --features "with-time with-chrono"

Cargo.toml

@@ -7,12 +7,15 @@ description = "Range support for rust-postgres"
 repository = "https://github.com/sfackler/rust-postgres-range"
 documentation = "https://sfackler.github.io/rust-postgres-range/doc/v0.9.0/postgres_range"
 
+[features]
+with-time = ["time", "postgres-shared/with-time"]
+with-chrono = ["chrono", "postgres-shared/with-chrono"]
+
 [dependencies]
-time = "0.1"
-postgres = "0.15"
+time ={version = "0.1", optional = true }
 postgres-protocol = "0.3"
-chrono = "0.4.0"
-postgres-shared = {version = "0.4.0", features = ["with-chrono"] }
+chrono = {version = "0.4.0", optional = true }
+postgres-shared = "0.4.0"
 
 [dev-dependencies]
 postgres ={version = "0.15", features = ["with-time"] }

src/impls.rs

@@ -1,5 +1,5 @@
 use std::error::Error;
-usepostgres::types::{FromSql,IsNull,Kind,ToSql,Type};
+usepostgres_shared::types::{FromSql,IsNull,Kind,ToSql,Type};
 use postgres_protocol::{selfas protocol, types};
 
 use{BoundSided,BoundType,Normalizable,Range,RangeBound};
@@ -116,6 +116,7 @@ mod test{
 
 use postgres::{Connection,TlsMode};
 use postgres::types::{FromSql,ToSql};
+#[cfg(feature = "with-time")]
 use time::{self,Timespec};
 
 macro_rules! test_range {
@@ -163,6 +164,7 @@ mod test{
 test_range!("INT8RANGE",i64,100i64,"100",200i64,"200")
 }
 
+#[cfg(feature = "with-time")]
 fntest_timespec_range_params(sql_type:&str){
 fnt(time:&str) -> Timespec{
  time::strptime(time,"%Y-%m-%d").unwrap().to_timespec()
@@ -173,11 +175,13 @@ mod test{
 }
 
 #[test]
+#[cfg(feature = "with-time")]
 fntest_tsrange_params(){
 test_timespec_range_params("TSRANGE");
 }
 
 #[test]
+#[cfg(feature = "with-time")]
 fntest_tstzrange_params(){
 test_timespec_range_params("TSTZRANGE");
 }

src/lib.rs

@@ -1,20 +1,26 @@
 //! Types dealing with ranges of values
 #![doc(html_root_url = "https://sfackler.github.io/rust-postgres-range/doc/v0.8.2")]
 
-#[macro_use(to_sql_checked)]
-externcrate postgres;
 externcrate postgres_protocol;
+#[macro_use(to_sql_checked)]
 externcrate postgres_shared;
+
+#[cfg(feature = "with-time")]
 externcrate time;
+#[cfg(feature = "with-chrono")]
 externcrate chrono;
-use chrono::{DateTime,TimeZone};
 
+#[cfg(test)]
+externcrate postgres;
+
+#[cfg(feature = "with-chrono")]
+use chrono::{DateTime,TimeZone};
 use std::cmp::Ordering;
 use std::fmt;
 use std::i32;
 use std::i64;
 use std::marker::PhantomData;
-
+#[cfg(feature = "with-time")]
 use time::Timespec;
 
 useBoundSide::{Lower,Upper};
@@ -149,6 +155,7 @@ macro_rules! bounded_normalizable{
 bounded_normalizable!(i32);
 bounded_normalizable!(i64);
 
+#[cfg(feature = "with-time")]
 implNormalizableforTimespec{
 fnnormalize<S>(bound:RangeBound<S,Timespec>) -> RangeBound<S,Timespec>
 where
@@ -158,7 +165,8 @@ impl Normalizable for Timespec{
 }
 }
 
-impl<T>NormalizableforDateTime<T>
+#[cfg(feature = "with-chrono")]
+impl<T>NormalizableforDateTime<T>
 whereT:TimeZone{
 fnnormalize<S>(bound:RangeBound<S,DateTime<T>>) -> RangeBound<S,DateTime<T>>
 where