From 7d623f0854d01b5c1c9f83d7d9eccede086f963c Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Mon, 3 Oct 2022 15:35:35 -0600 Subject: [PATCH] rust: fix clippy lint for explicit_auto_deref This adds unnecessary complexity to code. --- rust/src/http2/parser.rs | 6 +++--- rust/src/mqtt/mqtt.rs | 26 +++++++++++++------------- rust/src/mqtt/mqtt_message.rs | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/rust/src/http2/parser.rs b/rust/src/http2/parser.rs index df139b57cf..5bc73814d5 100644 --- a/rust/src/http2/parser.rs +++ b/rust/src/http2/parser.rs @@ -57,7 +57,7 @@ impl std::str::FromStr for HTTP2FrameType { fn from_str(s: &str) -> Result { let su = s.to_uppercase(); - let su_slice: &str = &*su; + let su_slice: &str = &su; match su_slice { "DATA" => Ok(HTTP2FrameType::DATA), "HEADERS" => Ok(HTTP2FrameType::HEADERS), @@ -132,7 +132,7 @@ impl std::str::FromStr for HTTP2ErrorCode { fn from_str(s: &str) -> Result { let su = s.to_uppercase(); - let su_slice: &str = &*su; + let su_slice: &str = &su; match su_slice { "NO_ERROR" => Ok(HTTP2ErrorCode::NOERROR), "PROTOCOL_ERROR" => Ok(HTTP2ErrorCode::PROTOCOLERROR), @@ -702,7 +702,7 @@ impl std::str::FromStr for HTTP2SettingsId { fn from_str(s: &str) -> Result { let su = s.to_uppercase(); - let su_slice: &str = &*su; + let su_slice: &str = &su; match su_slice { "SETTINGS_HEADER_TABLE_SIZE" => Ok(HTTP2SettingsId::SETTINGSHEADERTABLESIZE), "SETTINGS_ENABLE_PUSH" => Ok(HTTP2SettingsId::SETTINGSENABLEPUSH), diff --git a/rust/src/mqtt/mqtt.rs b/rust/src/mqtt/mqtt.rs index 5cf624ccd4..04691218d5 100644 --- a/rust/src/mqtt/mqtt.rs +++ b/rust/src/mqtt/mqtt.rs @@ -309,9 +309,9 @@ impl MQTTState { } MQTTOperation::CONNACK(ref _connack) => { if let Some(tx) = self.get_tx_by_pkt_id(MQTT_CONNECT_PKT_ID) { - (*tx).msg.push(msg); - (*tx).complete = true; - (*tx).pkt_id = None; + tx.msg.push(msg); + tx.complete = true; + tx.pkt_id = None; self.connected = true; } else { let mut tx = self.new_tx(msg, toclient); @@ -327,7 +327,7 @@ impl MQTTState { return; } if let Some(tx) = self.get_tx_by_pkt_id(v.message_id as u32) { - (*tx).msg.push(msg); + tx.msg.push(msg); } else { let mut tx = self.new_tx(msg, toclient); MQTTState::set_event(&mut tx, MQTTEvent::MissingPublish); @@ -342,9 +342,9 @@ impl MQTTState { return; } if let Some(tx) = self.get_tx_by_pkt_id(v.message_id as u32) { - (*tx).msg.push(msg); - (*tx).complete = true; - (*tx).pkt_id = None; + tx.msg.push(msg); + tx.complete = true; + tx.pkt_id = None; } else { let mut tx = self.new_tx(msg, toclient); MQTTState::set_event(&mut tx, MQTTEvent::MissingPublish); @@ -359,9 +359,9 @@ impl MQTTState { return; } if let Some(tx) = self.get_tx_by_pkt_id(suback.message_id as u32) { - (*tx).msg.push(msg); - (*tx).complete = true; - (*tx).pkt_id = None; + tx.msg.push(msg); + tx.complete = true; + tx.pkt_id = None; } else { let mut tx = self.new_tx(msg, toclient); MQTTState::set_event(&mut tx, MQTTEvent::MissingSubscribe); @@ -376,9 +376,9 @@ impl MQTTState { return; } if let Some(tx) = self.get_tx_by_pkt_id(unsuback.message_id as u32) { - (*tx).msg.push(msg); - (*tx).complete = true; - (*tx).pkt_id = None; + tx.msg.push(msg); + tx.complete = true; + tx.pkt_id = None; } else { let mut tx = self.new_tx(msg, toclient); MQTTState::set_event(&mut tx, MQTTEvent::MissingUnsubscribe); diff --git a/rust/src/mqtt/mqtt_message.rs b/rust/src/mqtt/mqtt_message.rs index aadcf83e1c..62ad006c12 100644 --- a/rust/src/mqtt/mqtt_message.rs +++ b/rust/src/mqtt/mqtt_message.rs @@ -88,7 +88,7 @@ impl std::str::FromStr for MQTTTypeCode { type Err = String; fn from_str(s: &str) -> Result { let su = s.to_uppercase(); - let su_slice: &str = &*su; + let su_slice: &str = &su; match su_slice { "CONNECT" => Ok(MQTTTypeCode::CONNECT), "CONNACK" => Ok(MQTTTypeCode::CONNACK),