Merge pull request #203 from zeromq/simplify-match-and-error

Simplify match and error
zeromq · Dec 13, 2024 · d06811a · d06811a
2 parents 77f842b + 98f9217
commit d06811a
Showing 1 changed file with 11 additions and 22 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -231,18 +231,16 @@ pub trait Socket: Sized + Send {
         let endpoint = TryIntoEndpoint::try_into(endpoint)?;
 
         let cloned_backend = self.backend();
-        let cback = move |result| {
+        let cback = move |result: ZmqResult<(FramedIo, Endpoint)>| {
             let cloned_backend = cloned_backend.clone();
             async move {
                 let result = match result {
-                    Ok((socket, endpoint)) => {
-                        match util::peer_connected(socket, cloned_backend.clone()).await {
-                            Ok(peer_id) => Ok((endpoint, peer_id)),
-                            Err(e) => Err(e),
-                        }
-                    }
+                    Ok((socket, endpoint)) => util::peer_connected(socket, cloned_backend.clone())
+                        .await
+                        .map(|peer_id| (endpoint, peer_id)),
                     Err(e) => Err(e),
                 };
+
                 match result {
                     Ok((endpoint, peer_id)) => {
                         if let Some(monitor) = cloned_backend.monitor().lock().as_mut() {
@@ -303,22 +301,13 @@ pub trait Socket: Sized + Send {
         let backend = self.backend();
         let endpoint = TryIntoEndpoint::try_into(endpoint)?;
 
-        let result = match util::connect_forever(endpoint).await {
-            Ok((socket, endpoint)) => match util::peer_connected(socket, backend).await {
-                Ok(peer_id) => Ok((endpoint, peer_id)),
-                Err(e) => Err(e),
-            },
-            Err(e) => Err(e),
-        };
-        match result {
-            Ok((endpoint, peer_id)) => {
-                if let Some(monitor) = self.backend().monitor().lock().as_mut() {
-                    let _ = monitor.try_send(SocketEvent::Connected(endpoint, peer_id));
-                }
-                Ok(())
-            }
-            Err(e) => Err(e),
+        let (socket, endpoint) = util::connect_forever(endpoint).await?;
+        let peer_id = util::peer_connected(socket, backend).await?;
+
+        if let Some(monitor) = self.backend().monitor().lock().as_mut() {
+            let _ = monitor.try_send(SocketEvent::Connected(endpoint, peer_id));
         }
+        Ok(())
     }
 
     /// Creates and setups new socket monitor