From ba7fc75ee6d7a9ffa3faf2a35719dde6e9f5987f Mon Sep 17 00:00:00 2001 From: Orne Brocaar Date: Wed, 10 Aug 2022 11:34:33 +0100 Subject: [PATCH] Fix clippy warnings. --- chirpstack/src/api/device.rs | 3 ++- chirpstack/src/framelog.rs | 2 +- chirpstack/src/gateway/backend/mqtt.rs | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/chirpstack/src/api/device.rs b/chirpstack/src/api/device.rs index 9b21447e..8cbabb92 100644 --- a/chirpstack/src/api/device.rs +++ b/chirpstack/src/api/device.rs @@ -667,7 +667,8 @@ impl DeviceService for Device { kind: match v.kind { fields::MeasurementKind::COUNTER => common::MetricKind::Counter, fields::MeasurementKind::ABSOLUTE => common::MetricKind::Absolute, - fields::MeasurementKind::GAUGE | _ => common::MetricKind::Gauge, + fields::MeasurementKind::GAUGE => common::MetricKind::Gauge, + _ => common::MetricKind::Gauge, } .into(), }, diff --git a/chirpstack/src/framelog.rs b/chirpstack/src/framelog.rs index 3fbbc0ab..04aaa32a 100644 --- a/chirpstack/src/framelog.rs +++ b/chirpstack/src/framelog.rs @@ -348,7 +348,7 @@ pub async fn get_frame_logs( if let Err(e) = res { // Return in case of channel error, in any other case we just log // the error. - if let Some(_) = e.downcast_ref::>() { + if e.downcast_ref::>().is_some() { return Err(e); } diff --git a/chirpstack/src/gateway/backend/mqtt.rs b/chirpstack/src/gateway/backend/mqtt.rs index e8a814bb..213d3c59 100644 --- a/chirpstack/src/gateway/backend/mqtt.rs +++ b/chirpstack/src/gateway/backend/mqtt.rs @@ -311,7 +311,7 @@ async fn message_callback(region_name: &str, region_common_name: CommonName, msg return Ok(()); } - let json = payload_is_json(&b); + let json = payload_is_json(b); info!( region_name = region_name, @@ -328,7 +328,7 @@ async fn message_callback(region_name: &str, region_common_name: CommonName, msg }) .inc(); let mut event = match json { - true => serde_json::from_slice(&b)?, + true => serde_json::from_slice(b)?, false => chirpstack_api::gw::UplinkFrame::decode(&mut Cursor::new(b))?, }; event.v4_migrate(); @@ -347,7 +347,7 @@ async fn message_callback(region_name: &str, region_common_name: CommonName, msg }) .inc(); let mut event = match json { - true => serde_json::from_slice(&b)?, + true => serde_json::from_slice(b)?, false => chirpstack_api::gw::GatewayStats::decode(&mut Cursor::new(b))?, }; event.v4_migrate(); @@ -367,7 +367,7 @@ async fn message_callback(region_name: &str, region_common_name: CommonName, msg }) .inc(); let mut event = match json { - true => serde_json::from_slice(&b)?, + true => serde_json::from_slice(b)?, false => chirpstack_api::gw::DownlinkTxAck::decode(&mut Cursor::new(b))?, }; event.v4_migrate();