More enum namespacing preparation

Author: sfackler

README.md

@@ -21,7 +21,7 @@ extern crate time;
 
 use time::Timespec;
 
-use postgres::{Connection, NoSsl};
+use postgres::{Connection, SslMode};
 
 struct Person {
     id: i32,
@@ -31,7 +31,7 @@ struct Person {
 }
 
 fn main() {
-    let conn = Connection::connect("postgres://postgres@localhost", &NoSsl)
+    let conn = Connection::connect("postgres://postgres@localhost", &SslMode::None)
             .unwrap();
 
     conn.execute("CREATE TABLE person (
@@ -297,8 +297,8 @@ traits.
 ### UUID type
 
 [UUID](http://www.postgresql.org/docs/9.4/static/datatype-uuid.html) support is
-provided optionally by the `uuid` feature. It is enabled by default.  To
-disable `UUID` support, add `default-features = false` to your Cargo manifest:
+provided optionally by the `uuid` feature. It is enabled by default. To disable
+`UUID` support, add `default-features = false` to your Cargo manifest:
 
 ```toml
 [dependencies.postgres]

src/io.rs

@@ -4,8 +4,7 @@ use std::io::net::tcp;
 use std::io::net::pipe;
 use std::io::{Stream, IoResult};
 
-use {ConnectParams, SslMode, NoSsl, PreferSsl, RequireSsl, ConnectTarget};
-use error::{ConnectError, NoSslSupport, SslError};
+use {ConnectParams, SslMode, ConnectTarget, ConnectError};
 use message;
 use message::{SslRequest, WriteMessage};
 
@@ -90,24 +89,24 @@ pub fn initialize_stream(params: &ConnectParams, ssl: &SslMode)
     let mut socket = try!(open_socket(params));
 
     let (ssl_required, ctx) = match *ssl {
-        NoSsl => return Ok(MaybeSslStream::Normal(socket)),
-        PreferSsl(ref ctx) => (false, ctx),
-        RequireSsl(ref ctx) => (true, ctx)
+        SslMode::None => return Ok(MaybeSslStream::Normal(socket)),
+        SslMode::Prefer(ref ctx) => (false, ctx),
+        SslMode::Require(ref ctx) => (true, ctx)
     };
 
     try!(socket.write_message(&SslRequest { code: message::SSL_CODE }));
     try!(socket.flush());
 
     if try!(socket.read_u8()) == 'N' as u8 {
         if ssl_required {
-            return Err(NoSslSupport);
+            return Err(ConnectError::NoSslSupport);
         } else {
             return Ok(MaybeSslStream::Normal(socket));
         }
     }
 
     match ssl::SslStream::new(ctx, socket) {
         Ok(stream) => Ok(MaybeSslStream::Ssl(stream)),
-        Err(err) => Err(SslError(err))
+        Err(err) => Err(ConnectError::SslError(err))
     }
 }