From 821af51985ace4dc0efb7f7c3ff86c7f8730c9ea Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sun, 13 Apr 2025 14:38:00 +0200
Subject: update for newer rust versions

---
 src/bot/mod.rs         | 7 ++-----
 src/lib.rs             | 1 -
 src/spectate/server.rs | 6 +++---
 3 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index 17472d2..3722bf8 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -1,6 +1,6 @@
 use crate::{game::protocol::Direction, State};
 use log::debug;
-use rand::{seq::IteratorRandom, thread_rng};
+use rand::{rng, seq::IteratorRandom};
 use serde::Deserialize;
 use std::{ops::DerefMut, sync::Arc};
 use tokio::spawn;
@@ -38,10 +38,7 @@ async fn bot(_config: Config, state: Arc<State>, name: String) {
                     possible.push(d)
                 }
             }
-            *dir = *possible
-                .iter()
-                .choose(&mut thread_rng())
-                .unwrap_or(&Direction::Up);
+            *dir = *possible.iter().choose(&mut rng()).unwrap_or(&Direction::Up);
             debug!(name:?, dir:?; "");
         }
     }
diff --git a/src/lib.rs b/src/lib.rs
index f07a24a..349c988 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(async_closure)]
 #![feature(iterator_try_collect)]
 use game::Game;
 use redb::Database;
diff --git a/src/spectate/server.rs b/src/spectate/server.rs
index fdcc815..7f8c90a 100644
--- a/src/spectate/server.rs
+++ b/src/spectate/server.rs
@@ -5,7 +5,7 @@ use axum::{
     extract::{
         self,
         connect_info::ConnectInfo,
-        ws::{Message, WebSocket, WebSocketUpgrade},
+        ws::{Message, Utf8Bytes, WebSocket, WebSocketUpgrade},
     },
     http::HeaderMap,
     response::{Html, IntoResponse},
@@ -217,7 +217,7 @@ async fn handle_socket(
     let past = state.past_events.read().await.clone();
     for p in past {
         socket
-            .send(Message::Text(serde_json::to_string(&p)?))
+            .send(Message::Text(Utf8Bytes::from(serde_json::to_string(&p)?)))
             .await?;
     }
     let mut live = state.events.subscribe();
@@ -229,7 +229,7 @@ async fn handle_socket(
             }
             event = live.recv() => {
                 socket
-                    .send(Message::Text(serde_json::to_string(&event?)?))
+                    .send(Message::Text(Utf8Bytes::from( serde_json::to_string(&event?)?)))
                     .await?;
             }
         }
-- 
cgit v1.2.3-70-g09d2