diff options
author | metamuffin <metamuffin@disroot.org> | 2025-06-03 20:00:18 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2025-06-03 20:00:18 +0200 |
commit | db4587d3ec64b7e28691b43f9d9701939eed94d1 (patch) | |
tree | 1005017ea4a5d4e287024eaf08f876c7e34bfbdb /server/client-lib/src/network | |
parent | 9ee7eef2919feffe4e0695494d4027e8ec011808 (diff) | |
download | hurrycurry-db4587d3ec64b7e28691b43f9d9701939eed94d1.tar hurrycurry-db4587d3ec64b7e28691b43f9d9701939eed94d1.tar.bz2 hurrycurry-db4587d3ec64b7e28691b43f9d9701939eed94d1.tar.zst |
update rust toolchain and rust dependencies.
`map_many_mut` and `trait_upcasting` was stabilized.
Diffstat (limited to 'server/client-lib/src/network')
-rw-r--r-- | server/client-lib/src/network/sync.rs | 9 | ||||
-rw-r--r-- | server/client-lib/src/network/tokio.rs | 10 |
2 files changed, 11 insertions, 8 deletions
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(()) } |