Update for upstream changes

Author: sfackler

src/error.rs

@@ -17,7 +17,7 @@ macro_rules! make_errors(
         #[allow(missing_doc)]
         pub enum PostgresSqlState {
             $($error,)+
-            UnknownSqlState(~str)
+            UnknownSqlState(StrBuf)
         }
 
         static STATE_MAP: PhfMap<PostgresSqlState> = phf_map!(
@@ -29,7 +29,7 @@ macro_rules! make_errors(
             pub fn from_code(s: &str) -> PostgresSqlState {
                 match STATE_MAP.find(&s) {
                     Some(state) => state.clone(),
-                    None => UnknownSqlState(s.to_owned())
+                    None => UnknownSqlState(s.to_strbuf())
                 }
             }
         }
@@ -362,8 +362,6 @@ pub enum PostgresConnectError {
     InvalidUrl(~str),
     /// The URL was missing a user
     MissingUser,
-    /// DNS lookup failed
-    DnsError(IoError),
     /// There was an error opening a socket to the server
     SocketError(IoError),
     /// An error from the Postgres server itself
@@ -386,7 +384,6 @@ impl fmt::Show for PostgresConnectError {
         match *self {
             InvalidUrl(ref err) => write!(fmt.buf, "Invalid URL: {}", err),
             MissingUser => fmt.buf.write_str("User missing in URL"),
-            DnsError(ref err) => write!(fmt.buf, "DNS lookup failed: {}", err),
             SocketError(ref err) =>
                 write!(fmt.buf, "Unable to open connection to server: {}", err),
             PgConnectDbError(ref err) => err.fmt(fmt),

src/io.rs

@@ -1,6 +1,5 @@
 use openssl::ssl::SslStream;
-use std::io::net;
-use std::io::net::ip::{Port, SocketAddr};
+use std::io::net::ip::Port;
 use std::io::net::tcp::TcpStream;
 use std::io::net::unix::UnixStream;
 use std::io::{Stream, IoResult};
@@ -14,7 +13,6 @@ use {PostgresConnectParams,
      TargetUnix};
 use error::{PostgresConnectError,
             PgConnectStreamError,
-            DnsError,
             NoSslSupport,
             SslError,
             SocketError};
@@ -25,20 +23,7 @@ static DEFAULT_PORT: Port = 5432;
 
 fn open_tcp_socket(host: &str, port: Port) -> Result<TcpStream,
                                                      PostgresConnectError> {
-    let addrs = match net::get_host_addresses(host) {
-        Ok(addrs) => addrs,
-        Err(err) => return Err(DnsError(err))
-    };
-
-    let mut err = None;
-    for &addr in addrs.iter() {
-        match TcpStream::connect(SocketAddr { ip: addr, port: port }) {
-            Ok(socket) => return Ok(socket),
-            Err(e) => err = Some(e)
-        }
-    }
-
-    Err(SocketError(err.unwrap()))
+    TcpStream::connect(host, port).map_err(|e| SocketError(e))
 }
 
 fn open_unix_socket(path: &Path, port: Port) -> Result<UnixStream,
@@ -150,4 +135,3 @@ pub fn initialize_stream(params: &PostgresConnectParams, ssl: &SslMode)
         Err(err) => Err(SslError(err))
     }
 }
-

src/test.rs

@@ -25,7 +25,6 @@ use error::{PgConnectDbError,
             PgWrongType,
             PgInvalidColumn,
             PgWasNull,
-            DnsError,
             MissingPassword,
             Position,
             PostgresDbError,
@@ -972,16 +971,6 @@ fn test_md5_pass_wrong_pass() {
     }
 }
 
-#[test]
-fn test_dns_failure() {
-    let ret = PostgresConnection::connect("postgres://postgres@asdfasdfasdf", &NoSsl);
-    match ret {
-        Err(DnsError(_)) => (),
-        Err(err) => fail!("Unexpected error {}", err),
-        _ => fail!("Expected error")
-    }
-}
-
 #[test]
 fn test_jsonarray_params() {
     test_array_params!("JSON",