Merge branch 'master' into renovate/uuid-1.x

rust/Cargo.lock

@@ -2024,14 +2024,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.26.0"
+version = "1.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64"
+checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f"
 dependencies = [
  "autocfg",
  "bytes",
  "libc",
- "memchr",
  "mio",
  "num_cpus",
  "parking_lot",
@@ -2039,18 +2038,18 @@ dependencies = [
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.8.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.11",
 ]
 
 [[package]]

rust/sea_battle_cli_player/Cargo.toml

@@ -19,7 +19,7 @@ env_logger = "0.10.0"
 tui = "0.19.0"
 crossterm = "0.26.1"
 lazy_static = "1.4.0"
-tokio = "1.21.2"
+tokio = "1.28.0"
 num = "0.4.0"
 num-traits = "0.2.15"
 num-derive = "0.3.3"

rust/sea_battle_cli_player/src/client.rs

@@ -62,7 +62,7 @@ impl Client {
             &cli_args().local_server_address(),
             &format!(
                 "/play/bot?{}",
-                serde_urlencoded::to_string(&BotPlayQuery {
+                serde_urlencoded::to_string(BotPlayQuery {
                     rules: rules.clone(),
                     player_name: "Human".to_string()
                 })
@@ -78,7 +78,7 @@ impl Client {
             &cli_args().remote_server,
             &format!(
                 "/play/random?{}",
-                serde_urlencoded::to_string(&PlayRandomQuery {
+                serde_urlencoded::to_string(PlayRandomQuery {
                     player_name: player_name.to_string()
                 })
                 .unwrap()
@@ -93,7 +93,7 @@ impl Client {
             &cli_args().remote_server,
             &format!(
                 "/play/create_invite?{}",
-                serde_urlencoded::to_string(&CreateInviteQuery {
+                serde_urlencoded::to_string(CreateInviteQuery {
                     rules: rules.clone(),
                     player_name: player_name.to_string()
                 })
@@ -109,7 +109,7 @@ impl Client {
             &cli_args().remote_server,
             &format!(
                 "/play/accept_invite?{}",
-                serde_urlencoded::to_string(&AcceptInviteQuery {
+                serde_urlencoded::to_string(AcceptInviteQuery {
                     code,
                     player_name: player_name.to_string()
                 })