compilation, clippy

Author: isabelatkinson

Cargo.toml

@@ -87,7 +87,6 @@ error-backtrace = []
 # Enable SOCKS5 proxy support.
 socks5-proxy = ["dep:fast-socks5"]
 
-
 [dependencies]
 base64 = "0.22"
 bitflags = "2"

src/client/options.rs

@@ -1782,9 +1782,13 @@ impl ConnectionString {
             srv_service_name: _,
             wait_queue_timeout,
             tls_insecure,
+            #[cfg(feature = "socks5-proxy")]
             proxy_host,
+            #[cfg(feature = "socks5-proxy")]
             proxy_port,
+            #[cfg(feature = "socks5-proxy")]
             proxy_username,
+            #[cfg(feature = "socks5-proxy")]
             proxy_password,
             #[cfg(test)]
                 original_uri: _,
@@ -2087,20 +2091,23 @@ impl ConnectionString {
             opts.push_str(&format!("&srvMaxHosts={srv_max_hosts}"));
         }
 
-        if let Some(proxy_host) = proxy_host {
-            opts.push_str(&format!("&proxyHost={proxy_host}"));
-        }
+        #[cfg(feature = "socks5-proxy")]
+        {
+            if let Some(proxy_host) = proxy_host {
+                opts.push_str(&format!("&proxyHost={proxy_host}"));
+            }
 
-        if let Some(proxy_port) = proxy_port {
-            opts.push_str(&format!("&proxyPort={proxy_port}"));
-        }
+            if let Some(proxy_port) = proxy_port {
+                opts.push_str(&format!("&proxyPort={proxy_port}"));
+            }
 
-        if let Some(proxy_username) = proxy_username {
-            opts.push_str(&format!("&proxyUsername={proxy_username}"));
-        }
+            if let Some(proxy_username) = proxy_username {
+                opts.push_str(&format!("&proxyUsername={proxy_username}"));
+            }
 
-        if let Some(proxy_password) = proxy_password {
-            opts.push_str(&format!("&proxyPassword={proxy_password}"));
+            if let Some(proxy_password) = proxy_password {
+                opts.push_str(&format!("&proxyPassword={proxy_password}"));
+            }
         }
 
         if !opts.is_empty() {

src/cmap/establish.rs

@@ -22,14 +22,13 @@ use crate::{
     },
     error::{Error as MongoError, ErrorKind, Result},
     hello::HelloReply,
-    runtime::{
-        stream::{Proxy, DEFAULT_CONNECT_TIMEOUT},
-        AsyncStream,
-        TlsConfig,
-    },
+    runtime::{stream::DEFAULT_CONNECT_TIMEOUT, AsyncStream, TlsConfig},
     sdam::{topology::TopologySpec, HandshakePhase},
 };
 
+#[cfg(feature = "socks5-proxy")]
+use crate::runtime::stream::Proxy;
+
 /// Contains the logic to establish a connection, including handshaking, authenticating, and
 /// potentially more.
 #[derive(Clone)]

src/error.rs

@@ -577,8 +577,9 @@ impl Error {
             | ErrorKind::Authentication { .. }
             | ErrorKind::Custom(_)
             | ErrorKind::Shutdown
-            | ErrorKind::GridFs(_)
-            | ErrorKind::ProxyConnect { .. } => {}
+            | ErrorKind::GridFs(_) => {}
+            #[cfg(feature = "socks5-proxy")]
+            ErrorKind::ProxyConnect { .. } => {}
             #[cfg(feature = "in-use-encryption")]
             ErrorKind::Encryption(_) => {}
             #[cfg(feature = "bson-3")]

src/runtime/stream.rs

@@ -127,7 +127,7 @@ impl AsyncStream {
                 ServerAddress::Tcp { host, port } => {
                     #[cfg(feature = "socks5-proxy")]
                     if let Some(proxy) = proxy {
-                        let inner = proxy.connect(host.clone(), port.clone()).await?;
+                        let inner = proxy.connect(host.clone(), *port).await?;
                         return match tls_cfg {
                             Some(cfg) => {
                                 Ok(AsyncStream::Socks5Tls(tls_connect(host, inner, cfg).await?))