From bc3aa9467ae1e2d0ea1727093af9b0af14965e69 Mon Sep 17 00:00:00 2001 From: mat <27899617+mat-1@users.noreply.github.com> Date: Fri, 7 Oct 2022 20:12:36 -0500 Subject: Replace impl Read with Cursor<&[u8]> (#26) * Start getting rid of Cursor * try to make the tests pass and fail * make the tests pass * remove unused uses * fix clippy warnings * fix potential OOM exploits * fix OOM in az-nbt * fix nbt benchmark * fix a test * start replacing it with Cursor> * wip * fix all the issues * fix all tests * fix nbt benchmark * fix warnings --- azalea-protocol/src/packets/game/clientbound_explode_packet.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'azalea-protocol/src/packets/game/clientbound_explode_packet.rs') diff --git a/azalea-protocol/src/packets/game/clientbound_explode_packet.rs b/azalea-protocol/src/packets/game/clientbound_explode_packet.rs index 97f58782..10a9e9a9 100644 --- a/azalea-protocol/src/packets/game/clientbound_explode_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_explode_packet.rs @@ -1,7 +1,7 @@ use azalea_buf::{BufReadError, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable}; use azalea_core::BlockPos; use azalea_protocol_macros::ClientboundGamePacket; -use std::io::{Read, Write}; +use std::io::{Cursor, Write}; #[derive(Clone, Debug, PartialEq, ClientboundGamePacket)] pub struct ClientboundExplodePacket { @@ -16,7 +16,7 @@ pub struct ClientboundExplodePacket { } impl McBufReadable for ClientboundExplodePacket { - fn read_from(buf: &mut impl Read) -> Result { + fn read_from(buf: &mut Cursor<&[u8]>) -> Result { let x = f32::read_from(buf)?; let y = f32::read_from(buf)?; let z = f32::read_from(buf)?; @@ -112,7 +112,7 @@ mod tests { }; let mut buf = Vec::new(); packet.write_into(&mut buf).unwrap(); - let packet2 = ClientboundExplodePacket::read_from(&mut buf.as_slice()).unwrap(); + let packet2 = ClientboundExplodePacket::read_from(&mut Cursor::new(&buf)).unwrap(); assert_eq!(packet, packet2); } } -- cgit v1.2.3