From 6b40f2dbc5ff38e0e1e2310ccc7aa050a3a8c75a Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Thu, 13 Aug 2020 13:09:24 +0100
Subject: [PATCH] virtio-devices: vsock: Fix clippy error

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 virtio-devices/src/vsock/unix/muxer.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/virtio-devices/src/vsock/unix/muxer.rs b/virtio-devices/src/vsock/unix/muxer.rs
index 7625a2674..f292e944f 100644
--- a/virtio-devices/src/vsock/unix/muxer.rs
+++ b/virtio-devices/src/vsock/unix/muxer.rs
@@ -420,7 +420,7 @@ impl VsockMuxer {
             Some(EpollListener::LocalStream(_)) => {
                 if let Some(EpollListener::LocalStream(mut stream)) = self.remove_listener(fd) {
                     Self::read_local_stream_port(&mut stream)
-                        .and_then(|peer_port| Ok((self.allocate_local_port(), peer_port)))
+                        .map(|peer_port| (self.allocate_local_port(), peer_port))
                         .and_then(|(local_port, peer_port)| {
                             self.add_connection(
                                 ConnMapKey {
@@ -517,7 +517,7 @@ impl VsockMuxer {
                 evset: conn.get_polled_evset(),
             },
         )
-        .and_then(|_| {
+        .map(|_| {
             if conn.has_pending_rx() {
                 // We can safely ignore any error in adding a connection RX indication. Worst
                 // case scenario, the RX queue will get desynchronized, but we'll handle that
@@ -525,7 +525,6 @@ impl VsockMuxer {
                 self.rxq.push(MuxerRx::ConnRx(key));
             }
             self.conn_map.insert(key, conn);
-            Ok(())
         })
     }
 
@@ -573,9 +572,8 @@ impl VsockMuxer {
             fd,
             epoll::Event::new(evset, fd as u64),
         )
-        .and_then(|_| {
+        .map(|_| {
             self.listener_map.insert(fd, listener);
-            Ok(())
         })
         .map_err(Error::EpollAdd)?;