From f4478864ee3ac43a4d4aac5673e4831237ccd3c1 Mon Sep 17 00:00:00 2001
From: Orne Brocaar <info@brocaar.com>
Date: Tue, 24 May 2022 16:15:12 +0100
Subject: [PATCH] Fix clippy warnings.

---
 chirpstack/src/codec/convert.rs    | 49 ++++++++++++++----------------
 chirpstack/src/integration/mqtt.rs |  4 +--
 chirpstack/src/storage/metrics.rs  |  1 +
 3 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/chirpstack/src/codec/convert.rs b/chirpstack/src/codec/convert.rs
index 67de1c62..01c9c081 100644
--- a/chirpstack/src/codec/convert.rs
+++ b/chirpstack/src/codec/convert.rs
@@ -110,32 +110,27 @@ pub fn pb_json_to_prost(obj: &pbjson_types::Struct) -> prost_types::Struct {
 
 fn _pb_json_to_prost(v: &pbjson_types::Value) -> prost_types::Value {
     prost_types::Value {
-        kind: match &v.kind {
-            None => None,
-            Some(v) => Some(match v {
-                pbjson_types::value::Kind::NullValue(v) => prost_types::value::Kind::NullValue(*v),
-                pbjson_types::value::Kind::NumberValue(v) => {
-                    prost_types::value::Kind::NumberValue(*v)
-                }
-                pbjson_types::value::Kind::StringValue(v) => {
-                    prost_types::value::Kind::StringValue(v.to_string())
-                }
-                pbjson_types::value::Kind::BoolValue(v) => prost_types::value::Kind::BoolValue(*v),
-                pbjson_types::value::Kind::StructValue(v) => {
-                    prost_types::value::Kind::StructValue(prost_types::Struct {
-                        fields: v
-                            .fields
-                            .iter()
-                            .map(|(k, v)| (k.to_string(), _pb_json_to_prost(v)))
-                            .collect(),
-                    })
-                }
-                pbjson_types::value::Kind::ListValue(v) => {
-                    prost_types::value::Kind::ListValue(prost_types::ListValue {
-                        values: v.values.iter().map(|i| _pb_json_to_prost(i)).collect(),
-                    })
-                }
-            }),
-        },
+        kind: v.kind.as_ref().map(|v| match v {
+            pbjson_types::value::Kind::NullValue(v) => prost_types::value::Kind::NullValue(*v),
+            pbjson_types::value::Kind::NumberValue(v) => prost_types::value::Kind::NumberValue(*v),
+            pbjson_types::value::Kind::StringValue(v) => {
+                prost_types::value::Kind::StringValue(v.to_string())
+            }
+            pbjson_types::value::Kind::BoolValue(v) => prost_types::value::Kind::BoolValue(*v),
+            pbjson_types::value::Kind::StructValue(v) => {
+                prost_types::value::Kind::StructValue(prost_types::Struct {
+                    fields: v
+                        .fields
+                        .iter()
+                        .map(|(k, v)| (k.to_string(), _pb_json_to_prost(v)))
+                        .collect(),
+                })
+            }
+            pbjson_types::value::Kind::ListValue(v) => {
+                prost_types::value::Kind::ListValue(prost_types::ListValue {
+                    values: v.values.iter().map(_pb_json_to_prost).collect(),
+                })
+            }
+        }),
     }
 }
diff --git a/chirpstack/src/integration/mqtt.rs b/chirpstack/src/integration/mqtt.rs
index 91750463..ecf71134 100644
--- a/chirpstack/src/integration/mqtt.rs
+++ b/chirpstack/src/integration/mqtt.rs
@@ -150,7 +150,7 @@ impl<'a> Integration<'a> {
                 info!("Starting MQTT consumer loop");
                 while let Some(msg_opt) = stream.next().await {
                     if let Some(msg) = msg_opt {
-                        let caps = match command_regex.captures(&msg.topic()) {
+                        let caps = match command_regex.captures(msg.topic()) {
                             Some(v) => v,
                             None => {
                                 error!(topic = %msg.topic(), "Error parsing command topic (regex captures returned None)");
@@ -398,7 +398,7 @@ async fn message_callback(
         match command.as_ref() {
             "down" => {
                 let cmd: integration::DownlinkCommand = match json {
-                    true => serde_json::from_slice(&b)?,
+                    true => serde_json::from_slice(b)?,
                     false => integration::DownlinkCommand::decode(&mut Cursor::new(b))?,
                 };
                 if dev_eui != cmd.dev_eui {
diff --git a/chirpstack/src/storage/metrics.rs b/chirpstack/src/storage/metrics.rs
index a4ce13b3..798364f2 100644
--- a/chirpstack/src/storage/metrics.rs
+++ b/chirpstack/src/storage/metrics.rs
@@ -10,6 +10,7 @@ use tracing::info;
 
 use crate::storage::{get_redis_conn, redis_key};
 
+#[allow(clippy::upper_case_acronyms)]
 #[allow(non_camel_case_types)]
 #[derive(Deserialize, Serialize, Copy, Clone, Debug, Eq, PartialEq)]
 pub enum Aggregation {