Revert "more fixes for older rustc"

This reverts commit 84e1c9d0c6ce2dd5ddc0f49b85c2deb996393726.

diff --git a/src/client.rs b/src/client.rs
index 643be3feb53e6d8a45160e020abd7b0146d328f5..1cc8618a27ee32962785ad3a5b5b47470c3a4cef 100644 (file)
--- a/src/client.rs
+++ b/src/client.rs
@@ -121,8 +121,8 @@ impl ConnectionState {
                 self.client = ClientState::LoginAuthIssued { username, challenge: challenge.clone() };
                 ServerMessage::LoginAuthChallenge { challenge }
             }
-            (&mut ClientState::LoginAuthIssued { username, ref challenge }, ClientMessage::LoginAuthResponse { ref signature }) => {
-                if self.server.verify(username, &challenge, signature).await {
+            (&mut ClientState::LoginAuthIssued { username, ref challenge }, ClientMessage::LoginAuthResponse { signature }) => {
+                if self.server.verify(username, &challenge, &signature).await {
                     self.client = ClientState::LoggedIn { username, state: LoggedInState::Idle };
                     ServerMessage::LoginSuccess
                 } else {
@@ -168,12 +168,11 @@ impl ConnectionState {
                     (Err(err), _, _) | (_, Err(err), _) | (_, _, Err(err)) => ServerMessage::JoinGameFailure { reason: err.to_string() },
                 }
             }
-            (&mut ClientState::LoggedIn { username, state: LoggedInState::InGame { ref mut game } }, ClientMessage::TakeAction { ref action }) => {
+            (&mut ClientState::LoggedIn { username, state: LoggedInState::InGame { ref mut game } }, ClientMessage::TakeAction { action }) => {
                 let timestamp = match self.server.now().await {
                     Ok(timestamp) => timestamp,
                     Err(err) => return ServerMessage::InternalError { reason: err.to_string() },
                 };
-                let action = action.clone();
                 let action = UserAction { timestamp, username, action };
                 let id = game.id();
                 loop {