fix clippy warnings
authorGeoffrey Allott <geoffrey@allott.email>
Sun, 9 Jan 2022 21:53:28 +0000 (21:53 +0000)
committerGeoffrey Allott <geoffrey@allott.email>
Sun, 9 Jan 2022 21:53:28 +0000 (21:53 +0000)
src/auth.rs
src/client.rs
src/dealer.rs
src/game/mod.rs

index 621af6a48c883150a12a07274b769fbe8374ede3..f37c2e370b3692d8a13a6c1d343ff7e1ca6d4744 100644 (file)
@@ -26,7 +26,7 @@ impl Auth {
         match self {
             Auth::NoLogin => false,
             Auth::Plain { password } => signature == password,
-            Auth::Scrypt { phc } => match PasswordHash::new(&phc) {
+            Auth::Scrypt { phc } => match PasswordHash::new(phc) {
                 Ok(hash) => Scrypt.verify_password(signature.as_bytes(), &hash).is_ok(),
                 Err(err) => {
                     error!("Failed to parse {:?} as PHC string format specification: {}", phc, err);
index a67df2c9173f04b7e530576ae30989149e0b53c2..26df2613b32741b189800ef9704f2760551ad1de 100644 (file)
@@ -122,7 +122,7 @@ impl ConnectionState {
                 ServerMessage::LoginAuthChallenge { challenge }
             }
             (&mut ClientState::LoginAuthIssued { username, ref challenge }, ClientMessage::LoginAuthResponse { signature }) => {
-                if self.server.verify(username, &challenge, &signature).await {
+                if self.server.verify(username, challenge, &signature).await {
                     self.client = ClientState::LoggedIn { username, state: LoggedInState::Idle };
                     ServerMessage::LoginSuccess
                 } else {
index 1dad8027f11f56192056871d06631ae3b669d8a2..f04b360d900ecd72ba6a8c21c3cce5a6b5fa11e8 100644 (file)
@@ -138,8 +138,8 @@ impl Dealer {
         let game = &mut self.dealer.game;
         match self.server.take_action(game.id(), game.actions_len(), &action).await? {
             ActionStatus::Committed => match game.take_action(action) {
-                Ok(()) => return Ok(ActionStatus::Committed),
-                Err(err) => return Err(RedisError::from((ErrorKind::ClientError, "Invalid action", err.to_string()))),
+                Ok(()) => Ok(ActionStatus::Committed),
+                Err(err) => Err(RedisError::from((ErrorKind::ClientError, "Invalid action", err.to_string()))),
             },
             ActionStatus::Interrupted => {
                 debug!("Action {:?} was interrupted", action);
index d06ca9dfb288c85d1446a0b773028ae3067c2be2..3736c56d30b2e3b2c4dd6824aa5be55bdbbfadf1 100644 (file)
@@ -97,7 +97,7 @@ impl GameList {
     }
 
     pub fn matches(&self, game: &GameSummary) -> bool {
-        self.filter.matches(&game)
+        self.filter.matches(game)
     }
 }