From 8fe521749ae65274f979722161ebfbdfcb91e4a5 Mon Sep 17 00:00:00 2001 From: CosminPerRam Date: Tue, 27 Jun 2023 00:18:56 +0300 Subject: [PATCH] [Protocol] Remove bufferer::remaining_data_vec function and replace its usage --- src/bufferer.rs | 2 -- src/protocols/gamespy/protocols/three/protocol.rs | 6 +++--- src/protocols/valve/protocol.rs | 2 +- src/protocols/valve/types.rs | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/bufferer.rs b/src/bufferer.rs index 7cd423a..a7df551 100644 --- a/src/bufferer.rs +++ b/src/bufferer.rs @@ -166,8 +166,6 @@ impl Bufferer { pub fn remaining_data(&self) -> &[u8] { &self.data[self.position ..] } - pub fn remaining_data_vec(&self) -> Vec { self.remaining_data().to_vec() } - pub fn remaining_length(&self) -> usize { self.data.len() - self.position } pub fn is_remaining_empty(&self) -> bool { self.remaining_length() == 0 } diff --git a/src/protocols/gamespy/protocols/three/protocol.rs b/src/protocols/gamespy/protocols/three/protocol.rs index c5adce6..567ad92 100644 --- a/src/protocols/gamespy/protocols/three/protocol.rs +++ b/src/protocols/gamespy/protocols/three/protocol.rs @@ -139,7 +139,7 @@ impl GameSpy3 { if self.single_packets { buf.move_position_ahead(11); - return Ok(vec![buf.remaining_data_vec()]); + return Ok(vec![buf.remaining_data().to_vec()]); } if buf.get_string_utf8()? != "splitnum" { @@ -159,7 +159,7 @@ impl GameSpy3 { values.push(Vec::new()); } - values[packet_id] = buf.remaining_data_vec(); + values[packet_id] = buf.remaining_data().to_vec(); } if values.iter().any(|v| v.is_empty()) { @@ -185,7 +185,7 @@ pub(crate) fn data_to_map(packet: &[u8]) -> GDResult<(HashMap, V vars.insert(key, value); } - Ok((vars, buf.remaining_data_vec())) + Ok((vars, buf.remaining_data().to_vec())) } /// If there are parsing problems using the `query` function, you can directly diff --git a/src/protocols/valve/protocol.rs b/src/protocols/valve/protocol.rs index 1593e32..a673bfb 100644 --- a/src/protocols/valve/protocol.rs +++ b/src/protocols/valve/protocol.rs @@ -87,7 +87,7 @@ impl SplitPacket { compressed, decompressed_size, uncompressed_crc32, - payload: buffer.remaining_data_vec(), + payload: buffer.remaining_data().to_vec(), }) } diff --git a/src/protocols/valve/types.rs b/src/protocols/valve/types.rs index 5ce3933..608480b 100644 --- a/src/protocols/valve/types.rs +++ b/src/protocols/valve/types.rs @@ -213,7 +213,7 @@ impl Packet { Ok(Self { header: buffer.get_u32()?, kind: buffer.get_u8()?, - payload: buffer.remaining_data_vec(), + payload: buffer.remaining_data().to_vec(), }) }