Merge pull request #5 from xiaocq2001/chxiao/auth_support

Fix compile warnings.
ting-ms · Jun 14, 2024 · 0c5783e · 0c5783e
2 parents 8b349fc + 2c0a896
commit 0c5783e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/rumqttc/src/v5/mod.rs b/rumqttc/src/v5/mod.rs
@@ -577,9 +577,7 @@ impl MqttOptions {
     }
 
     pub fn auth_manager(&self) -> Option<Arc<Mutex<dyn AuthManager>>> {
-        if self.auth_manager.is_none() {
-            return None;
-        }
+        self.auth_manager.as_ref()?;
 
         self.auth_manager.clone()
     }

diff --git a/rumqttc/src/v5/state.rs b/rumqttc/src/v5/state.rs
@@ -513,7 +513,7 @@ impl MqttState {
 
                 self.outgoing_auth(client_auth)
             }
-            _ => return Err(StateError::AuthError("Authentication Failed!".to_string())),
+            _ => Err(StateError::AuthError("Authentication Failed!".to_string())),
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -513,7 +513,7 @@ impl MqttState { @@
                     self.outgoing_auth(client_auth)
                 }
-                _ => return Err(StateError::AuthError("Authentication Failed!".to_string())),
+                _ => Err(StateError::AuthError("Authentication Failed!".to_string())),
             }
         }
@@ Expand Down @@