Utilise the newly stabilised loop-with-break-value

1 files changed, 12 insertions, 20 deletions

diff --git a/src/voice/connection.rs b/src/voice/connection.rs
index 801c871..ced6a79 100644
--- a/src/voice/connection.rs
+++ b/src/voice/connection.rs
@@ -71,27 +71,19 @@ impl Connection {
 
         client.send_json(&payload::build_identify(&info))?;
 
-        let hello = {
-            let hello;
-
-            loop {
-                match client.recv_json(VoiceEvent::decode)? {
-                    VoiceEvent::Hello(received_hello) => {
-                        hello = received_hello;
-
-                        break;
-                    },
-                    VoiceEvent::Heartbeat(_) => continue,
-                    other => {
-                        debug!("[Voice] Expected hello/heartbeat; got: {:?}",
-                               other);
-
-                        return Err(Error::Voice(VoiceError::ExpectedHandshake));
-                    },
-                }
+        let hello = loop {
+            match client.recv_json(VoiceEvent::decode)? {
+                VoiceEvent::Hello(received_hello) => {
+                    break received_hello;
+                },
+                VoiceEvent::Heartbeat(_) => continue,
+                other => {
+                    debug!("[Voice] Expected hello/heartbeat; got: {:?}",
+                            other);
+
+                    return Err(Error::Voice(VoiceError::ExpectedHandshake));
+                },
             }
-
-            hello
         };
 
         if !has_valid_mode(&hello.modes) {