Move error types to error module

Author: sfackler

src/error.rs

@@ -1,3 +1,5 @@
+//! Error types.
+
 use byteorder;
 use phf;
 use std::error;

src/lib.rs

@@ -75,7 +75,7 @@ use std::vec;
 #[cfg(feature = "unix_socket")]
 use std::path::PathBuf;
 
-pub use error::{Error, ConnectError, SqlState, DbError, ErrorPosition};
+use error::{Error, ConnectError, SqlState, DbError};
 #[doc(inline)]
 pub use types::{ToSql, FromSql};
 use io::{StreamWrapper, NegotiateSsl};
@@ -91,7 +91,7 @@ use url::Url;
 #[macro_use]
 mod macros;
 
-mod error;
+pub mod error;
 pub mod io;
 mod message;
 mod priv_io;
@@ -964,26 +964,26 @@ impl Connection {
     /// ## Examples
     ///
     /// ```rust,no_run
-    /// # use postgres::{Connection, SslMode, ConnectError};
-    /// # fn f() -> Result<(), ConnectError> {
+    /// # use postgres::{Connection, SslMode};
+    /// # fn f() -> Result<(), ::postgres::error::ConnectError> {
     /// let url = "postgresql://postgres:hunter2@localhost:2994/foodb";
     /// let conn = try!(Connection::connect(url, &SslMode::None));
     /// # Ok(()) };
     /// ```
     ///
     /// ```rust,no_run
-    /// # use postgres::{Connection, SslMode, ConnectError};
-    /// # fn f() -> Result<(), ConnectError> {
+    /// # use postgres::{Connection, SslMode};
+    /// # fn f() -> Result<(), ::postgres::error::ConnectError> {
     /// let url = "postgresql://postgres@%2Frun%2Fpostgres";
     /// let conn = try!(Connection::connect(url, &SslMode::None));
     /// # Ok(()) };
     /// ```
     ///
     /// ```rust,no_run
     /// # #![allow(unstable)]
-    /// # use postgres::{Connection, UserInfo, ConnectParams, SslMode, ConnectTarget, ConnectError};
+    /// # use postgres::{Connection, UserInfo, ConnectParams, SslMode, ConnectTarget};
     /// # #[cfg(feature = "unix_socket")]
-    /// # fn f() -> Result<(), ConnectError> {
+    /// # fn f() -> Result<(), ::postgres::error::ConnectError> {
     /// # let some_crazy_path = Path::new("");
     /// let params = ConnectParams {
     ///     target: ConnectTarget::Unix(some_crazy_path),
@@ -1082,7 +1082,7 @@ impl Connection {
     ///
     /// ```rust,no_run
     /// # use postgres::{Connection, SslMode};
-    /// # fn foo() -> Result<(), postgres::Error> {
+    /// # fn foo() -> Result<(), postgres::error::Error> {
     /// # let conn = Connection::connect("", &SslMode::None).unwrap();
     /// let trans = try!(conn.transaction());
     /// try!(trans.execute("UPDATE foo SET bar = 10", &[]));

src/macros.rs

@@ -13,7 +13,7 @@ macro_rules! try_desync {
 macro_rules! check_desync {
     ($e:expr) => ({
         if $e.is_desynchronized() {
-            return Err(::Error::StreamDesynchronized);
+            return Err(::error::Error::StreamDesynchronized);
         }
     })
 }
@@ -22,6 +22,6 @@ macro_rules! bad_response {
     ($s:expr) => ({
         debug!("Bad response at {}:{}", file!(), line!());
         $s.desynchronized = true;
-        return Err(::Error::IoError(::bad_response()));
+        return Err(::error::Error::IoError(::bad_response()));
     })
 }

src/priv_io.rs

@@ -9,7 +9,8 @@ use std::os::unix::io::{AsRawFd, RawFd};
 #[cfg(windows)]
 use std::os::windows::io::{AsRawSocket, RawSocket};
 
-use {SslMode, ConnectError, ConnectParams, ConnectTarget};
+use {SslMode, ConnectParams, ConnectTarget};
+use error::{ConnectError};
 use io::{NegotiateSsl, StreamWrapper};
 use message::{self, WriteMessage};
 use message::FrontendMessage::SslRequest;

src/types/mod.rs

@@ -35,7 +35,7 @@ macro_rules! to_sql_checked {
                           ctx: &$crate::types::SessionInfo)
                           -> $crate::Result<$crate::types::IsNull> {
             if !<Self as $crate::types::ToSql>::accepts(ty) {
-                return Err($crate::Error::WrongType(ty.clone()));
+                return Err($crate::error::Error::WrongType(ty.clone()));
             }
             self.to_sql(ty, out, ctx)
         }

src/types/rustc_serialize.rs

@@ -3,7 +3,8 @@ use std::error;
 use std::io::prelude::*;
 use byteorder::{ReadBytesExt, WriteBytesExt};
 
-use {Result, Error};
+use Result;
+use error::Error;
 use types::{FromSql, ToSql, IsNull, Type, SessionInfo};
 
 impl FromSql for json::Json {

src/types/serde.rs

@@ -5,7 +5,8 @@ use std::io::prelude::*;
 use byteorder::{ReadBytesExt, WriteBytesExt};
 use self::serde::json::{self, Value};
 
-use {Result, Error};
+use Result;
+use error::Error;
 use types::{FromSql, ToSql, IsNull, Type, SessionInfo};
 
 impl FromSql for Value {

src/types/slice.rs

@@ -1,7 +1,8 @@
 use std::io::prelude::*;
 use byteorder::{WriteBytesExt, BigEndian};
 
-use {Result, Error};
+use Result;
+use error::Error;
 use types::{Type, ToSql, Kind, IsNull, SessionInfo};
 
 /// An adapter type mapping slices to Postgres arrays.

tests/test.rs

@@ -13,19 +13,17 @@ use postgres::{HandleNotice,
                Connection,
                GenericConnection,
                SslMode,
-               Error,
-               ConnectError,
-               DbError,
                IntoConnectParams,
                IsolationLevel};
+use postgres::error::{Error, ConnectError, DbError};
 use postgres::types::{Type, Kind};
-use postgres::SqlState::{SyntaxError,
-                         QueryCanceled,
-                         UndefinedTable,
-                         InvalidCatalogName,
-                         InvalidPassword,
-                         CardinalityViolation};
-use postgres::ErrorPosition::Normal;
+use postgres::error::SqlState::{SyntaxError,
+                                QueryCanceled,
+                                UndefinedTable,
+                                InvalidCatalogName,
+                                InvalidPassword,
+                                CardinalityViolation};
+use postgres::error::ErrorPosition::Normal;
 
 macro_rules! or_panic {
     ($e:expr) => (

tests/types/mod.rs

@@ -3,7 +3,8 @@ use std::f32;
 use std::f64;
 use std::fmt;
 
-use postgres::{Connection, SslMode, Slice, Error};
+use postgres::{Connection, SslMode, Slice};
+use postgres::error::Error;
 use postgres::types::{ToSql, FromSql};
 
 #[cfg(feature = "uuid")]