Replacing .unwrap with ? in mod.rs

rabbitmq · Feb 2, 2023 · fba7600 · fba7600
1 parent 61d2803
commit fba7600
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/client/mod.rs b/src/client/mod.rs
@@ -396,13 +396,11 @@ impl Client {
                 .danger_accept_invalid_certs(true)
                 .danger_accept_invalid_hostnames(true);
 
-            let conn = tls_builder.build();
+            let conn = tokio_native_tls::TlsConnector::from( tls_builder.build()?);
 
-            let conn = tokio_native_tls::TlsConnector::from(conn.unwrap());
+            let stream = conn.connect(broker.host.as_str(), stream).await?;
 
-            let stream = conn.connect(broker.host.as_str(), stream).await;
-
-            GenericTcpStream::SecureTcp(stream.unwrap())
+            GenericTcpStream::SecureTcp(stream)
         } else {
             let stream = TcpStream::connect((broker.host.as_str(), broker.port)).await?;
             GenericTcpStream::Tcp(stream)

diff --git a/src/error.rs b/src/error.rs
@@ -8,15 +8,17 @@ use thiserror::Error;
 pub enum ClientError {
     #[error(transparent)]
     Io(#[from] std::io::Error),
+
     #[error(transparent)]
     Protocol(#[from] ProtocolError),
     #[error("Cast Error: {0}")]
     CastError(String),
-
     #[error(transparent)]
     GenericError(#[from] Box<dyn std::error::Error + Send + Sync>),
     #[error("Client already closed")]
     AlreadyClosed,
+    #[error("tls_error")]
+    Tls(tokio_native_tls::native_tls::Error),
 }
 
 #[derive(Error, Debug)]
@@ -25,6 +27,7 @@ pub enum ProtocolError {
     Encode(EncodeError),
     #[error("Decode Error {0:?}")]
     Decode(DecodeError),
+
 }
 
 impl From<EncodeError> for ClientError {
@@ -33,6 +36,12 @@ impl From<EncodeError> for ClientError {
     }
 }
 
+impl From<tokio_native_tls::native_tls::Error> for ClientError {
+    fn from(err: tokio_native_tls::native_tls::Error) -> Self {
+        ClientError::Tls(err)
+    }
+}
+
 impl From<DecodeError> for ClientError {
     fn from(err: DecodeError) -> Self {
         ClientError::Protocol(ProtocolError::Decode(err))