pierre/SeaBattle
1
0
Fork 0
Code Issues Pull Requests 9 Packages Projects Releases Wiki Activity

Merge branch 'master' into renovate/serde-1.x
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details

Browse Source
This commit is contained in:
Pierre HUBERT 2023-05-01 17:21:14 +00:00
commit 0a7e9b9661
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rust/Cargo.lock generated
View File

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

2
rust/sea_battle_backend/Cargo.toml
View File

@ -22,7 +22,7 @@ actix-cors = "0.6.2"
actix = "0.13.0" actix = "0.13.0"
actix-web-actors = "4.1.0" actix-web-actors = "4.1.0"
actix-rt = "2.7.0" actix-rt = "2.7.0"
uuid = { version = "1.1.2", features = ["v4"] } uuid = { version = "1.3.2", features = ["v4"] }
rand = "0.8.5" rand = "0.8.5"
serde_with = "2.0.1" serde_with = "2.0.1"
tokio = { version = "1", features = ["full"] } tokio = { version = "1", features = ["full"] }

2
rust/sea_battle_cli_player/Cargo.toml
View File

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

8
rust/sea_battle_cli_player/src/client.rs
View File

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