From 6a8047a5fed4686b1a6d211e218c3175678d5e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Wed, 13 May 2020 15:04:53 +0200
Subject: [PATCH] aquatic_ws: run_handshakes_and_read_messages: simplify

---
 aquatic_ws/src/lib/network/mod.rs | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/aquatic_ws/src/lib/network/mod.rs b/aquatic_ws/src/lib/network/mod.rs
index b63a9a5..7b71f6b 100644
--- a/aquatic_ws/src/lib/network/mod.rs
+++ b/aquatic_ws/src/lib/network/mod.rs
@@ -317,6 +317,8 @@ pub fn run_handshakes_and_read_messages(
             stage: ConnectionStage::EstablishedWs(established_ws),
             ..
         }) = connections.get_mut(&poll_token){
+            use ::tungstenite::Error::Io;
+
             match established_ws.ws.read_message(){
                 Ok(ws_message) => {
                     dbg!(ws_message.clone());
@@ -333,22 +335,9 @@ pub fn run_handshakes_and_read_messages(
                         in_message_sender.send((meta, in_message));
                     }
                 },
-                Err(tungstenite::Error::Io(err)) => {
-                    if err.kind() == ErrorKind::WouldBlock {
-                        break;
-                    }
-    
-                    remove_connection_if_exists(connections, poll_token);
-    
-                    eprint!("{}", err);
-    
-                    break;
-                },
-                Err(tungstenite::Error::ConnectionClosed) => {
-                    remove_connection_if_exists(connections, poll_token);
-    
-                    break;
-                },
+                Err(Io(err)) if err.kind() == ErrorKind::WouldBlock => {
+                    break
+                }
                 Err(err) => {
                     dbg!(err);