Revert "feat(client): use non-zero ports resolved by dns resolvers (hyperium#148)"

This reverts commit 2639193.

Author: x86pup

src/client/legacy/connect/http.rs

@@ -546,8 +546,7 @@ where
                 .map_err(ConnectError::dns)?;
             let addrs = addrs
                 .map(|mut addr| {
-                    set_port(&mut addr, port, dst.port().is_some());
-
+                    addr.set_port(port);
                     addr
                 })
                 .collect();
@@ -988,19 +987,9 @@ impl ConnectingTcp<'_> {
     }
 }
 
-/// Respect explicit ports in the URI, if none, either
-/// keep non `0` ports resolved from a custom dns resolver,
-/// or use the default port for the scheme.
-fn set_port(addr: &mut SocketAddr, host_port: u16, explicit: bool) {
-    if explicit || addr.port() == 0 {
-        addr.set_port(host_port)
-    };
-}
-
 #[cfg(test)]
 mod tests {
     use std::io;
-    use std::net::SocketAddr;
 
     use ::http::Uri;
 
@@ -1009,8 +998,6 @@ mod tests {
     use super::super::sealed::{Connect, ConnectSvc};
     use super::{Config, ConnectError, HttpConnector};
 
-    use super::set_port;
-
     async fn connect<C>(
         connector: C,
         dst: Uri,
@@ -1429,22 +1416,4 @@ mod tests {
             panic!("test failed");
         }
     }
-
-    #[test]
-    fn test_set_port() {
-        // Respect explicit ports no matter what the resolved port is.
-        let mut addr = SocketAddr::from(([0, 0, 0, 0], 6881));
-        set_port(&mut addr, 42, true);
-        assert_eq!(addr.port(), 42);
-
-        // Ignore default  host port, and use the socket port instead.
-        let mut addr = SocketAddr::from(([0, 0, 0, 0], 6881));
-        set_port(&mut addr, 443, false);
-        assert_eq!(addr.port(), 6881);
-
-        // Use the default port if the resolved port is `0`.
-        let mut addr = SocketAddr::from(([0, 0, 0, 0], 0));
-        set_port(&mut addr, 443, false);
-        assert_eq!(addr.port(), 443);
-    }
 }