Replace loop-brake with while

drogue-iot · Apr 22, 2023 · d354fc4 · d354fc4
1 parent daf37b2
commit d354fc4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/src/asynch.rs b/src/asynch.rs
@@ -86,7 +86,7 @@ where
             Handshake::new(Verifier::new(context.config.server_name));
         let mut state = State::ClientHello;
 
-        loop {
+        while state != State::ApplicationData {
             let next_state = state
                 .process(
                     &mut self.delegate,
@@ -100,11 +100,8 @@ where
                 .await?;
             trace!("State {:?} -> {:?}", state, next_state);
             state = next_state;
-            if let State::ApplicationData = state {
-                self.opened = true;
-                break;
-            }
         }
+        self.opened = true;
 
         Ok(())
     }

diff --git a/src/blocking.rs b/src/blocking.rs
@@ -86,7 +86,7 @@ where
             Handshake::new(Verifier::new(context.config.server_name));
         let mut state = State::ClientHello;
 
-        loop {
+        while state != State::ApplicationData {
             let next_state = state.process_blocking(
                 &mut self.delegate,
                 &mut handshake,
@@ -98,11 +98,8 @@ where
             )?;
             trace!("State {:?} -> {:?}", state, next_state);
             state = next_state;
-            if let State::ApplicationData = state {
-                self.opened = true;
-                break;
-            }
         }
+        self.opened = true;
 
         Ok(())
     }

diff --git a/src/connection.rs b/src/connection.rs
@@ -196,7 +196,7 @@ where
     }
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum State {
     ClientHello,