Fix errors from variant type namespace thing

Author: sfackler

src/error.rs

@@ -2,10 +2,10 @@
 
 use std::collections::HashMap;
 use std::from_str::FromStr;
-use std::io::IoError;
+use std::io;
 use std::fmt;
 
-use openssl::ssl::error::SslError;
+use openssl::ssl::error;
 use phf::PhfMap;
 
 use types::PostgresType;
@@ -364,7 +364,7 @@ pub enum PostgresConnectError {
     /// The URL was missing a user
     MissingUser,
     /// There was an error opening a socket to the server
-    SocketError(IoError),
+    SocketError(io::IoError),
     /// An error from the Postgres server itself
     PgConnectDbError(PostgresDbError),
     /// A password was required but not provided in the URL
@@ -375,9 +375,9 @@ pub enum PostgresConnectError {
     /// The Postgres server does not support SSL encryption
     NoSslSupport,
     /// There was an error initializing the SSL session
-    SslError(SslError),
+    SslError(error::SslError),
     /// There was an error communicating with the server
-    PgConnectStreamError(IoError),
+    PgConnectStreamError(io::IoError),
     /// The server sent an unexpected response
     PgConnectBadResponse,
 }
@@ -523,7 +523,7 @@ pub enum PostgresError {
     /// An error reported by the Postgres server
     PgDbError(PostgresDbError),
     /// An error communicating with the Postgres server
-    PgStreamError(IoError),
+    PgStreamError(io::IoError),
     /// The communication channel with the Postgres server has desynchronized
     /// due to an earlier communications error.
     PgStreamDesynchronized,

src/io.rs

@@ -1,7 +1,7 @@
-use openssl::ssl::SslStream;
+use openssl::ssl;
 use std::io::net::ip::Port;
-use std::io::net::tcp::TcpStream;
-use std::io::net::pipe::UnixStream;
+use std::io::net::tcp;
+use std::io::net::pipe;
 use std::io::{Stream, IoResult};
 
 use {PostgresConnectParams,
@@ -22,7 +22,7 @@ use message::{SslRequest, WriteMessage};
 static DEFAULT_PORT: Port = 5432;
 
 pub enum MaybeSslStream<S> {
-    SslStream(SslStream<S>),
+    SslStream(ssl::SslStream<S>),
     NormalStream(S),
 }
 
@@ -52,8 +52,8 @@ impl<S: Stream> Writer for MaybeSslStream<S> {
 }
 
 pub enum InternalStream {
-    TcpStream(TcpStream),
-    UnixStream(UnixStream),
+    TcpStream(tcp::TcpStream),
+    UnixStream(pipe::UnixStream),
 }
 
 impl Reader for InternalStream {
@@ -86,11 +86,11 @@ fn open_socket(params: &PostgresConnectParams)
     let port = params.port.unwrap_or(DEFAULT_PORT);
     let socket = match params.target {
         TargetTcp(ref host) =>
-            TcpStream::connect(host.as_slice(), port).map(|s| TcpStream(s)),
+            tcp::TcpStream::connect(host.as_slice(), port).map(|s| TcpStream(s)),
         TargetUnix(ref path) => {
             let mut path = path.clone();
             path.push(format!(".s.PGSQL.{}", port));
-            UnixStream::connect(&path).map(|s| UnixStream(s))
+            pipe::UnixStream::connect(&path).map(|s| UnixStream(s))
         }
     };
     socket.map_err(|e| SocketError(e))
@@ -117,7 +117,7 @@ pub fn initialize_stream(params: &PostgresConnectParams, ssl: &SslMode)
         }
     }
 
-    match SslStream::new(ctx, socket) {
+    match ssl::SslStream::new(ctx, socket) {
         Ok(stream) => Ok(SslStream(stream)),
         Err(err) => Err(SslError(err))
     }