From 5a3f189e5046dbd2d58ea244f103e0207be419c8 Mon Sep 17 00:00:00 2001
From: Paolo Barbolini <paolo.barbolini@m4ss.net>
Date: Fri, 2 May 2025 08:48:49 +0200
Subject: [PATCH] happy clippy

---
 src/transport/smtp/client/tls/mod.rs | 46 +++++++++++++---------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/transport/smtp/client/tls/mod.rs b/src/transport/smtp/client/tls/mod.rs
index e7e644e..2e7c206 100644
--- a/src/transport/smtp/client/tls/mod.rs
+++ b/src/transport/smtp/client/tls/mod.rs
@@ -84,12 +84,7 @@ impl<B: TlsBackend> TlsParametersBuilder<B> {
     }
 
     fn build(self) -> Result<TlsParameters<B>, Error> {
-        let (server_name, connector, extra_info) = B::__build_connector(self)?;
-        Ok(TlsParameters {
-            server_name,
-            connector,
-            extra_info,
-        })
+        B::__build_connector(self)
     }
 }
 
@@ -101,9 +96,8 @@ trait TlsBackend: private::SealedTlsBackend {
     type MinTlsVersion: Default;
 
     #[doc(hidden)]
-    fn __build_connector(
-        builder: TlsParametersBuilder<Self>,
-    ) -> Result<(Self::ServerName, Self::Connector, Self::ExtraInfo), Error>;
+    fn __build_connector(builder: TlsParametersBuilder<Self>)
+        -> Result<TlsParameters<Self>, Error>;
 
     #[doc(hidden)]
     fn __build_current_tls_parameters(inner: TlsParameters<Self>) -> self::current::TlsParameters;
@@ -139,9 +133,12 @@ impl TlsBackend for NativeTls {
 
     fn __build_connector(
         builder: TlsParametersBuilder<Self>,
-    ) -> Result<(Self::ServerName, Self::Connector, Self::ExtraInfo), Error> {
-        self::native_tls::build_connector(builder)
-            .map(|(server_name, connector)| (server_name, connector, ()))
+    ) -> Result<TlsParameters<Self>, Error> {
+        self::native_tls::build_connector(builder).map(|(server_name, connector)| TlsParameters {
+            server_name,
+            connector,
+            extra_info: (),
+        })
     }
 
     fn __build_current_tls_parameters(inner: TlsParameters<Self>) -> self::current::TlsParameters {
@@ -168,9 +165,12 @@ impl TlsBackend for Rustls {
 
     fn __build_connector(
         builder: TlsParametersBuilder<Self>,
-    ) -> Result<(Self::ServerName, Self::Connector, Self::ExtraInfo), Error> {
-        self::rustls::build_connector(builder)
-            .map(|(server_name, connector)| (server_name, connector, ()))
+    ) -> Result<TlsParameters<Self>, Error> {
+        self::rustls::build_connector(builder).map(|(server_name, connector)| TlsParameters {
+            server_name,
+            connector,
+            extra_info: (),
+        })
     }
 
     fn __build_current_tls_parameters(inner: TlsParameters<Self>) -> self::current::TlsParameters {
@@ -197,16 +197,14 @@ impl TlsBackend for BoringTls {
 
     fn __build_connector(
         builder: TlsParametersBuilder<Self>,
-    ) -> Result<(Self::ServerName, Self::Connector, Self::ExtraInfo), Error> {
+    ) -> Result<TlsParameters<Self>, Error> {
         let accept_invalid_hostnames = builder.accept_invalid_hostnames;
-        self::boring_tls::build_connector(builder).map(|(server_name, connector)| {
-            (
-                server_name,
-                connector,
-                BoringTlsExtraInfo {
-                    accept_invalid_hostnames,
-                },
-            )
+        self::boring_tls::build_connector(builder).map(|(server_name, connector)| TlsParameters {
+            server_name,
+            connector,
+            extra_info: BoringTlsExtraInfo {
+                accept_invalid_hostnames,
+            },
         })
     }