From 7d5edd9de856422e88ed8cc4f2b6bc776bd52872 Mon Sep 17 00:00:00 2001 From: Mark Blum Date: Fri, 27 Aug 2021 02:34:51 -0400 Subject: [PATCH] Applied a number of clippy suggestions --- src/bin/reencode.rs | 14 +++++--------- src/demo/gameevent_gen.rs | 2 +- src/demo/gamevent.rs | 2 +- src/demo/message/stringtable.rs | 2 +- src/demo/parser/analyser.rs | 2 +- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/bin/reencode.rs b/src/bin/reencode.rs index d4802b8..f3ed134 100644 --- a/src/bin/reencode.rs +++ b/src/bin/reencode.rs @@ -57,15 +57,11 @@ fn main() -> Result<(), MainError> { match &mut packet { Packet::Sigon(message_packet) | Packet::Message(message_packet) => { message_packet.meta.view_angles = Default::default(); - message_packet - .messages - .iter_mut() - .for_each(|msg| match msg { - Message::ServerInfo(info) => { - info.stv = true; - } - _ => {} - }); + message_packet.messages.iter_mut().for_each(|msg| { + if let Message::ServerInfo(info) = msg { + info.stv = true; + } + }); } _ => {} } diff --git a/src/demo/gameevent_gen.rs b/src/demo/gameevent_gen.rs index 10c78d6..c2ac220 100644 --- a/src/demo/gameevent_gen.rs +++ b/src/demo/gameevent_gen.rs @@ -7902,7 +7902,7 @@ impl GameEventType { GameEventType::ReplayEndRecord => "replay_endrecord", GameEventType::ReplayReplaysAvailable => "replay_replaysavailable", GameEventType::ReplayServerError => "replay_servererror", - GameEventType::Unknown(ty) => &ty, + GameEventType::Unknown(ty) => ty, } } } diff --git a/src/demo/gamevent.rs b/src/demo/gamevent.rs index 0cc4800..c3c562b 100644 --- a/src/demo/gamevent.rs +++ b/src/demo/gamevent.rs @@ -168,7 +168,7 @@ impl RawGameEvent { pub fn read(stream: &mut Stream, definition: &GameEventDefinition) -> Result { let mut values: Vec = Vec::with_capacity(definition.entries.len()); for entry in &definition.entries { - values.push(read_event_value(stream, &entry)?); + values.push(read_event_value(stream, entry)?); } Ok(RawGameEvent { diff --git a/src/demo/message/stringtable.rs b/src/demo/message/stringtable.rs index 1096bb2..a4d231a 100644 --- a/src/demo/message/stringtable.rs +++ b/src/demo/message/stringtable.rs @@ -731,7 +731,7 @@ pub fn encode_var_int_fixed(mut int: u32) -> u64 { let mut out = 0; for i in 0..4 { let byte: u8 = int as u8 & 0x7F; - out |= ((byte | 0x80) as u64) << i * 8; + out |= ((byte | 0x80) as u64) << (i * 8); int >>= 7; } out |= (int as u64) << 32; diff --git a/src/demo/parser/analyser.rs b/src/demo/parser/analyser.rs index c139187..c5f29a6 100644 --- a/src/demo/parser/analyser.rs +++ b/src/demo/parser/analyser.rs @@ -317,7 +317,7 @@ impl MessageHandler for Analyser { self.state.interval_per_tick = message.interval_per_tick } Message::GameEvent(message) => self.handle_event(&message.event, tick), - Message::UserMessage(message) => self.handle_user_message(&message, tick), + Message::UserMessage(message) => self.handle_user_message(message, tick), _ => {} } }