Peter_Computerliebe_ORG/battleship
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fmt, clippy

Browse Source
This commit is contained in:
sparshg
2024-10-06 00:47:39 +05:30
committed by Sparsh Goenka
parent 5fee374ac9
commit 2bb5efd9bb
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/game.rs
View File

@@ -94,9 +94,7 @@ pub async fn join_room(sid: Sid, code: String, pool: &sqlx::PgPool) -> Result<()
if [room.player1_id.as_ref(), room.player2_id.as_ref()] if [room.player1_id.as_ref(), room.player2_id.as_ref()]
.into_iter() .into_iter()
.flatten() .flatten()
.filter(|&x| x == sid) .any(|x| x == sid)
.next()
.is_some()
{ {
// if game was over, set status to waiting and return // if game was over, set status to waiting and return
if room.stat == Status::GameOver { if room.stat == Status::GameOver {
@@ -337,7 +335,11 @@ pub async fn attack(
} }
txn.commit().await?; txn.commit().await?;
Ok((hit, if hit { board.has_sunk((i, j)) } else { None }, game_over)) Ok((
hit,
if hit { board.has_sunk((i, j)) } else { None },
game_over,
))
} }
pub async fn update_sid(oldsid: &str, newsid: &str, pool: &sqlx::PgPool) -> Result<()> { pub async fn update_sid(oldsid: &str, newsid: &str, pool: &sqlx::PgPool) -> Result<()> {