From db4587d3ec64b7e28691b43f9d9701939eed94d1 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Tue, 3 Jun 2025 20:00:18 +0200
Subject: update rust toolchain and rust dependencies. `map_many_mut` and
 `trait_upcasting` was stabilized.

---
 server/client-lib/src/lib.rs           |  4 ++--
 server/client-lib/src/network/sync.rs  |  9 ++++-----
 server/client-lib/src/network/tokio.rs | 10 +++++++---
 3 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'server/client-lib/src')

diff --git a/server/client-lib/src/lib.rs b/server/client-lib/src/lib.rs
index a40eafc1..f59b3dc3 100644
--- a/server/client-lib/src/lib.rs
+++ b/server/client-lib/src/lib.rs
@@ -15,7 +15,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 */
-#![feature(map_many_mut, let_chains)]
+#![feature(let_chains)]
 pub mod network;
 pub mod spatial_index;
 
@@ -234,7 +234,7 @@ impl Game {
 
         self.players_spatial_index.all(|p1, pos1| {
             self.players_spatial_index.query(pos1, 2., |p2, _pos2| {
-                if let [Some(a), Some(b)] = self.players.get_many_mut([&p1, &p2]) {
+                if let [Some(a), Some(b)] = self.players.get_disjoint_mut([&p1, &p2]) {
                     a.movement.collide(&mut b.movement, dt)
                 }
             })
diff --git a/server/client-lib/src/network/sync.rs b/server/client-lib/src/network/sync.rs
index 02e612f4..45e84829 100644
--- a/server/client-lib/src/network/sync.rs
+++ b/server/client-lib/src/network/sync.rs
@@ -131,13 +131,12 @@ impl Network {
         for packet in self.queue_out.drain(..) {
             debug!("-> {packet:?}");
             if self.use_bincode {
-                self.sock.write(Message::Binary(bincode::encode_to_vec(
-                    &packet,
-                    BINCODE_CONFIG,
-                )?))?;
+                self.sock.write(Message::Binary(
+                    bincode::encode_to_vec(&packet, BINCODE_CONFIG)?.into(),
+                ))?;
             } else {
                 self.sock
-                    .write(Message::Text(serde_json::to_string(&packet)?))?;
+                    .write(Message::Text(serde_json::to_string(&packet)?.into()))?;
             }
         }
 
diff --git a/server/client-lib/src/network/tokio.rs b/server/client-lib/src/network/tokio.rs
index 3f68e091..f9f34172 100644
--- a/server/client-lib/src/network/tokio.rs
+++ b/server/client-lib/src/network/tokio.rs
@@ -130,12 +130,16 @@ impl Network {
         let mut g = self.sock_send.write().await;
         if self.use_bincode.load(Ordering::Relaxed) {
             g.send(Message::Binary(
-                bincode::encode_to_vec(&packet, BINCODE_CONFIG).unwrap(),
+                bincode::encode_to_vec(&packet, BINCODE_CONFIG)
+                    .unwrap()
+                    .into(),
             ))
             .await?;
         } else {
-            g.send(Message::Text(serde_json::to_string(&packet).unwrap()))
-                .await?;
+            g.send(Message::Text(
+                serde_json::to_string(&packet).unwrap().into(),
+            ))
+            .await?;
         }
         Ok(())
     }
-- 
cgit v1.2.3-70-g09d2