From 283ea7d422472d1030431c715a5addda36e8f2eb Mon Sep 17 00:00:00 2001 From: Pierre Hubert Date: Wed, 26 Apr 2023 00:31:21 +0000 Subject: [PATCH 1/5] Update Rust crate serde to 1.0.160 --- rust/Cargo.lock | 8 ++++---- rust/sea_battle_backend/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index c6a1d7b..84baffe 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1765,18 +1765,18 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", diff --git a/rust/sea_battle_backend/Cargo.toml b/rust/sea_battle_backend/Cargo.toml index e33914b..317484d 100644 --- a/rust/sea_battle_backend/Cargo.toml +++ b/rust/sea_battle_backend/Cargo.toml @@ -15,7 +15,7 @@ categories = [ "games" ] clap = { version = "4.2.4", features = ["derive"] } log = "0.4.17" env_logger = "0.10.0" -serde = { version = "1.0.159", features = ["derive"] } +serde = { version = "1.0.160", features = ["derive"] } serde_json = "1.0.96" actix-web = "4.1.0" actix-cors = "0.6.2" From 40bff4f8e4e67337a9ddb3379af27e53bf898e71 Mon Sep 17 00:00:00 2001 From: Pierre Hubert Date: Wed, 26 Apr 2023 00:31:35 +0000 Subject: [PATCH 2/5] Update Rust crate tokio to 1.28.0 --- rust/Cargo.lock | 13 ++++++------- rust/sea_battle_cli_player/Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index c6a1d7b..965309f 100644 --- a/rust/Cargo.lock +++ b/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]] diff --git a/rust/sea_battle_cli_player/Cargo.toml b/rust/sea_battle_cli_player/Cargo.toml index c499c71..302b922 100644 --- a/rust/sea_battle_cli_player/Cargo.toml +++ b/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" From 4ed1c9c2009d356d039a0b58954578e212d68ec8 Mon Sep 17 00:00:00 2001 From: Pierre Hubert Date: Sat, 29 Apr 2023 00:09:17 +0000 Subject: [PATCH 3/5] Update Rust crate serde_with to 2.3.3 --- rust/Cargo.lock | 44 +++++++++++++++--------------- rust/sea_battle_backend/Cargo.toml | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index c6a1d7b..4ad14a2 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -511,7 +511,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.15", ] [[package]] @@ -681,7 +681,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.11", + "syn 2.0.15", ] [[package]] @@ -698,14 +698,14 @@ checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.15", ] [[package]] name = "darling" -version = "0.14.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "e7c99d16b88c92aef47e58dadd53e87b4bd234c29934947a6cec8b466300f99b" dependencies = [ "darling_core", "darling_macro", @@ -713,27 +713,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "2ea05d2fcb27b53f7a98faddaf5f2914760330ab7703adfc9df13332b42189f9" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "7bfb82b62b1b8a2a9808fb4caf844ede819a76cfc23b2827d7f94eefb49551eb" dependencies = [ "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -1465,9 +1465,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -1780,7 +1780,7 @@ checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.15", ] [[package]] @@ -1808,9 +1808,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.1" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85456ffac572dc8826334164f2fb6fb40a7c766aebe195a2a21ee69ee2885ecf" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" dependencies = [ "base64 0.13.1", "chrono", @@ -1824,14 +1824,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.3.1" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cbcd6104f8a4ab6af7f6be2a0da6be86b9de3c401f6e86bb856ab2af739232f" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -1931,9 +1931,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.11" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", @@ -1977,7 +1977,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.15", ] [[package]] diff --git a/rust/sea_battle_backend/Cargo.toml b/rust/sea_battle_backend/Cargo.toml index e33914b..0d990e7 100644 --- a/rust/sea_battle_backend/Cargo.toml +++ b/rust/sea_battle_backend/Cargo.toml @@ -24,7 +24,7 @@ actix-web-actors = "4.1.0" actix-rt = "2.7.0" uuid = { version = "1.1.2", features = ["v4"] } rand = "0.8.5" -serde_with = "2.0.1" +serde_with = "2.3.3" tokio = { version = "1", features = ["full"] } semver = "1.0.14" From 7125076f1f04f9a699929a1d54cc5a053690ea55 Mon Sep 17 00:00:00 2001 From: Pierre Hubert Date: Mon, 1 May 2023 08:21:29 +0000 Subject: [PATCH 4/5] Update Rust crate uuid to 1.3.2 --- rust/Cargo.lock | 4 ++-- rust/sea_battle_backend/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index c6a1d7b..fb3b054 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -2241,9 +2241,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2" dependencies = [ "getrandom", ] diff --git a/rust/sea_battle_backend/Cargo.toml b/rust/sea_battle_backend/Cargo.toml index e33914b..76c87ab 100644 --- a/rust/sea_battle_backend/Cargo.toml +++ b/rust/sea_battle_backend/Cargo.toml @@ -22,7 +22,7 @@ actix-cors = "0.6.2" actix = "0.13.0" actix-web-actors = "4.1.0" actix-rt = "2.7.0" -uuid = { version = "1.1.2", features = ["v4"] } +uuid = { version = "1.3.2", features = ["v4"] } rand = "0.8.5" serde_with = "2.0.1" tokio = { version = "1", features = ["full"] } From 77d5b18f792a8ef5c9af14f38f5f18c6deeff214 Mon Sep 17 00:00:00 2001 From: Pierre Hubert Date: Mon, 1 May 2023 10:28:43 +0200 Subject: [PATCH 5/5] Fix cargo clippy issue --- rust/sea_battle_cli_player/src/client.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rust/sea_battle_cli_player/src/client.rs b/rust/sea_battle_cli_player/src/client.rs index b9d94f4..89e202e 100644 --- a/rust/sea_battle_cli_player/src/client.rs +++ b/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() })