From cd2849c817416c7be561028b65aba988848d2276 Mon Sep 17 00:00:00 2001 From: sigaloid <69441971+sigaloid@users.noreply.github.com> Date: Fri, 3 Sep 2021 19:19:54 -0400 Subject: [PATCH] Switch from `.unwrap()` to `match` Properly match on message, so client disconnect doesn't trigger a panic --- README.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 318b925..ef5f5b6 100644 --- a/README.md +++ b/README.md @@ -8,17 +8,20 @@ use std::thread::spawn; use tungstenite::accept; /// A WebSocket echo server -fn main () { +fn main() { let server = TcpListener::bind("127.0.0.1:9001").unwrap(); for stream in server.incoming() { - spawn (move || { + spawn(move || { let mut websocket = accept(stream.unwrap()).unwrap(); loop { - let msg = websocket.read_message().unwrap(); - - // We do not want to send back ping/pong messages. - if msg.is_binary() || msg.is_text() { - websocket.write_message(msg).unwrap(); + match websocket.read_message() { + Ok(msg) => { + // We do not want to send back ping/pong messages. + if msg.is_binary() || msg.is_text() { + websocket.write_message(msg).unwrap(); + } + } + Err(_) => {} } } });