Rework the future Connect trait to only have one method, which takes an Options arg.

src/util.rs

@@ -6,8 +6,8 @@
 use futures::{Future, Poll};
 use futures::stream::Stream;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use std::error::Error;
 use std::{fmt, io};
+use std::error::Error;
 use std::net::{SocketAddr, ToSocketAddrs};
 
 /// A bottom type that impls `Error`, `Serialize`, and `Deserialize`. It is impossible to
@@ -102,10 +102,10 @@ pub trait FirstSocketAddr: ToSocketAddrs {
     /// Returns the first resolved `SocketAddr`, if one exists.
     fn try_first_socket_addr(&self) -> io::Result<SocketAddr> {
         if let Some(a) = self.to_socket_addrs()?.next() {
-             Ok(a)
+            Ok(a)
         } else {
-             Err(io::Error::new(io::ErrorKind::AddrNotAvailable,
-                                "`ToSocketAddrs::to_socket_addrs` returned an empty iterator."))
+            Err(io::Error::new(io::ErrorKind::AddrNotAvailable,
+                               "`ToSocketAddrs::to_socket_addrs` returned an empty iterator."))
         }
     }