Just reexport types module

Author: sfackler

postgres/src/lib.rs

@@ -106,7 +106,7 @@ use types::{IsNull, Kind, Type, Oid, ToSql, FromSql, Field, OID, NAME, CHAR};
 #[doc(inline)]
 pub use postgres_shared::CancelData;
 #[doc(inline)]
-pub use postgres_shared::error;
+pub use postgres_shared::{error, types};
 #[doc(inline)]
 pub use error::Error;
 
@@ -121,7 +121,6 @@ pub mod params;
 pub mod rows;
 pub mod stmt;
 pub mod transaction;
-pub mod types;
 
 const TYPEINFO_QUERY: &'static str = "__typeinfo";
 const TYPEINFO_ENUM_QUERY: &'static str = "__typeinfo_enum";

postgres/src/types.rs

@@ -1,6 +1,7 @@
 extern crate fallible_iterator;
-#[macro_use]
 extern crate postgres;
+#[macro_use]
+extern crate postgres_shared;
 extern crate url;
 #[cfg(feature = "with-openssl")]
 extern crate openssl;

postgres/tests/test.rs

@@ -6,7 +6,6 @@ use std::fmt;
 use std::result;
 
 use postgres::{Connection, TlsMode};
-use postgres::error::Error;
 use postgres::types::{ToSql, FromSql, WrongType, Type, IsNull, Kind, TEXT, INT4, NUMERIC};
 
 #[cfg(feature = "with-bit-vec")]

postgres/tests/types/mod.rs

@@ -57,6 +57,7 @@
 extern crate bytes;
 extern crate fallible_iterator;
 extern crate futures_state_stream;
+#[cfg_attr(test, macro_use)]
 extern crate postgres_shared;
 extern crate postgres_protocol;
 extern crate tokio_core;
@@ -86,7 +87,7 @@ use std::sync::mpsc::{self, Sender, Receiver};
 use tokio_core::reactor::Handle;
 
 #[doc(inline)]
-pub use postgres_shared::{error, params, CancelData, Notification};
+pub use postgres_shared::{error, params, types, CancelData, Notification};
 #[doc(inline)]
 pub use error::Error;
 
@@ -106,8 +107,6 @@ mod sink;
 mod stream;
 pub mod tls;
 pub mod transaction;
-#[macro_use]
-pub mod types;
 
 #[cfg(test)]
 mod test;

tokio-postgres/src/lib.rs

@@ -6,8 +6,7 @@ use std::time::Duration;
 use tokio_core::reactor::{Core, Interval};
 
 use super::*;
-use error::{Error, INVALID_PASSWORD, INVALID_AUTHORIZATION_SPECIFICATION,
-            QUERY_CANCELED};
+use error::{INVALID_PASSWORD, INVALID_AUTHORIZATION_SPECIFICATION, QUERY_CANCELED};
 use params::{ConnectParams, Host};
 use types::{ToSql, FromSql, Type, IsNull, Kind, BYTEA, TEXT, INT4, NUMERIC};