From 5e0007fab63a11ab0ca52586c8fc35cb560116bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Eng=C3=A9libert?= <tuxmain@zettascript.org>
Date: Mon, 24 Aug 2026 09:20:01 +0200
Subject: [PATCH] Clippy

---
 src/data.rs  |  8 ++------
 src/lib.rs   | 36 +++++++++++++++++-------------------
 src/relay.rs |  6 +++---
 src/tcp.rs   | 14 ++++++--------
 4 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/src/data.rs b/src/data.rs
index f28fc03..4c68048 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -74,7 +74,6 @@ impl DownStreamInner {
 				} else if byte_count == -1 {
 					continue;
 				}
-			} else {
 			}
 		}
 	}
@@ -138,7 +137,6 @@ impl DownStreamInner {
 				} else if byte_count == -1 {
 					continue;
 				}
-			} else {
 			}
 		}
 	}
@@ -186,7 +184,7 @@ impl DownStreamInner {
 				},
 			}
 		}
-		return Some(data_length);
+		Some(data_length)
 	}
 }
 
@@ -257,7 +255,6 @@ impl UpStreamInner {
 				} else if byte_count == -1 {
 					continue;
 				}
-			} else {
 			}
 		}
 	}
@@ -317,7 +314,6 @@ impl UpStreamInner {
 				} else if byte_count == -1 {
 					continue;
 				}
-			} else {
 			}
 		}
 	}
@@ -365,6 +361,6 @@ impl UpStreamInner {
 				},
 			}
 		}
-		return Some(data_length);
+		Some(data_length)
 	}
 }
diff --git a/src/lib.rs b/src/lib.rs
index 394d256..a530faf 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -61,27 +61,25 @@
 //! 	}
 //! }
 //!
-//! fn main() {
-//! 	// Create new SSLRelay object
-//! 	let mut relay = sslrelay::SSLRelay::new(
-//! 		Handler,
-//! 		RelayConfig {
-//! 			downstream_data_type: TCPDataType::TLS,
-//! 			upstream_data_type: TCPDataType::TLS,
-//! 			bind_host: "0.0.0.0".to_string(),
-//! 			bind_port: "443".to_string(),
-//! 			remote_host: |_| "remote.com",
-//! 			remote_port: "443".to_string(),
-//! 			tls_config: TLSConfig::FILE {
-//! 				certificate_path: "./tls.crt".to_string(),
-//! 				private_key_path: "./tls.key".to_string(),
-//! 			},
+//! // Create new SSLRelay object
+//! let mut relay = sslrelay::SSLRelay::new(
+//! 	Handler,
+//! 	RelayConfig {
+//! 		downstream_data_type: TCPDataType::TLS,
+//! 		upstream_data_type: TCPDataType::TLS,
+//! 		bind_host: "0.0.0.0".to_string(),
+//! 		bind_port: "443".to_string(),
+//! 		remote_host: |_| "remote.com",
+//! 		remote_port: "443".to_string(),
+//! 		tls_config: TLSConfig::FILE {
+//! 			certificate_path: "./tls.crt".to_string(),
+//! 			private_key_path: "./tls.key".to_string(),
 //! 		},
-//! 	);
+//! 	},
+//! );
 //!
-//! 	// Start listening
-//! 	relay.start();
-//! }
+//! // Start listening
+//! relay.start();
 //! ```
 
 use openssl::{
diff --git a/src/relay.rs b/src/relay.rs
index 0ee0d04..c39bca3 100644
--- a/src/relay.rs
+++ b/src/relay.rs
@@ -16,7 +16,7 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
 	}
 	/// Starts the SSLRelay connection handling.
 	pub fn start(&mut self) {
-		let rhost = self.config.remote_host.clone();
+		let rhost = self.config.remote_host;
 		let rport = self.config.remote_port.clone();
 		let upstream_data_stream_type = self.config.upstream_data_type;
 
@@ -38,7 +38,7 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
 							let acceptor = acceptor.clone();
 							let mut handler_clone = self.handlers.as_ref().unwrap().clone();
 
-							let r_host = rhost.clone();
+							let r_host = rhost;
 							let r_port = rport.clone();
 
 							let this_conn_id = conn_id;
@@ -91,7 +91,7 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
 						Ok(stream) => {
 							let handler_clone = self.handlers.as_ref().unwrap().clone();
 
-							let r_host = rhost.clone();
+							let r_host = rhost;
 							let r_port = rport.clone();
 
 							let this_conn_id = conn_id;
diff --git a/src/tcp.rs b/src/tcp.rs
index 115ae6d..95d21c4 100644
--- a/src/tcp.rs
+++ b/src/tcp.rs
@@ -311,9 +311,8 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
 					Err(e) => {
 						Self::handle_error(
 							format!(
-								"Can't connect to remote host: {}\nErr: {}",
-								format!("{}:{}", remote_host, remote_port),
-								e
+								"Can't connect to remote host: {}:{}\nErr: {}",
+								remote_host, remote_port, e
 							)
 							.as_str(),
 						);
@@ -321,7 +320,7 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
 					}
 				};
 				let _ = s.set_read_timeout(Some(Duration::from_millis(50)));
-				return Ok(DataStreamType::RAW(s));
+				Ok(DataStreamType::RAW(s))
 			}
 			TCPDataType::TLS => {
 				let mut sslbuilder = SslConnector::builder(SslMethod::tls()).unwrap();
@@ -334,9 +333,8 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
 					Err(e) => {
 						Self::handle_error(
 							format!(
-								"Can't connect to remote host: {}\nErr: {}",
-								format!("{}:{}", remote_host, remote_port),
-								e
+								"Can't connect to remote host: {}:{}\nErr: {}",
+								remote_host, remote_port, e
 							)
 							.as_str(),
 						);
@@ -357,7 +355,7 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
 				let _ = s
 					.get_ref()
 					.set_read_timeout(Some(Duration::from_millis(50)));
-				return Ok(DataStreamType::TLS(s));
+				Ok(DataStreamType::TLS(s))
 			}
 		}
 	}