From 417fb09b139d9bb33219fadd30838c82fd19fbd5 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Mon, 25 May 2015 22:09:00 -0700
Subject: [PATCH] Un-reexport some type-related types

---
 src/lib.rs         | 4 ++--
 src/types/slice.rs | 4 ++--
 tests/test.rs      | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index a2751a08..5d2eaaf2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -77,9 +77,9 @@ use std::path::PathBuf;
 
 pub use error::{Error, ConnectError, SqlState, DbError, ErrorPosition};
 #[doc(inline)]
-pub use types::{Oid, Type, Other, Kind, ToSql, FromSql, SessionInfo};
+pub use types::{ToSql, FromSql};
 use io::{StreamWrapper, NegotiateSsl};
-use types::IsNull;
+use types::{IsNull, Kind, Type, SessionInfo, Oid, Other};
 #[doc(inline)]
 pub use types::Slice;
 use message::BackendMessage::*;
diff --git a/src/types/slice.rs b/src/types/slice.rs
index 37912bbc..3d89f02c 100644
--- a/src/types/slice.rs
+++ b/src/types/slice.rs
@@ -1,8 +1,8 @@
 use std::io::prelude::*;
 use byteorder::{WriteBytesExt, BigEndian};
 
-use {Type, ToSql, Result, Error, Kind};
-use types::{IsNull, SessionInfo};
+use {Result, Error};
+use types::{Type, ToSql, Kind, IsNull, SessionInfo};
 
 /// An adapter type mapping slices to Postgres arrays.
 ///
diff --git a/tests/test.rs b/tests/test.rs
index e4094fa0..79bb070e 100644
--- a/tests/test.rs
+++ b/tests/test.rs
@@ -13,13 +13,12 @@ use postgres::{HandleNotice,
                Connection,
                GenericConnection,
                SslMode,
-               Type,
-               Kind,
                Error,
                ConnectError,
                DbError,
                IntoConnectParams,
                IsolationLevel};
+use postgres::types::{Type, Kind};
 use postgres::SqlState::{SyntaxError,
                          QueryCanceled,
                          UndefinedTable,