From c664117971da8a34b12dc2d740bcab7a8937aba9 Mon Sep 17 00:00:00 2001
From: Bo Jeanes <me@bjeanes.com>
Date: Tue, 30 Aug 2022 20:24:40 +1000
Subject: [PATCH] Fix latest clippy errors

---
 modbus-mqtt/src/modbus/config.rs   | 14 ++++++--------
 modbus-mqtt/src/modbus/mod.rs      |  4 ++--
 sungrow-winets/src/lib.rs          |  2 +-
 tokio_modbus-winets/src/service.rs |  1 -
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/modbus-mqtt/src/modbus/config.rs b/modbus-mqtt/src/modbus/config.rs
index 65d279a..dfca1e2 100644
--- a/modbus-mqtt/src/modbus/config.rs
+++ b/modbus-mqtt/src/modbus/config.rs
@@ -1,8 +1,6 @@
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
 
-#[cfg(test)]
-use pretty_assertions::{assert_eq, assert_ne};
 #[cfg(test)]
 use serde_json::json;
 
@@ -57,7 +55,7 @@ fn default_modbus_parity() -> tokio_serial::Parity {
     tokio_serial::Parity::None
 }
 
-#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Default, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase", default)]
 pub struct RegisterNumericAdjustment {
     pub scale: i8, // powers of 10 (0 = no adjustment, 1 = x10, -1 = /10)
@@ -65,7 +63,7 @@ pub struct RegisterNumericAdjustment {
     // precision: Option<u8>,
 }
 
-#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Default, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum RegisterNumeric {
     U8,
@@ -105,13 +103,13 @@ impl RegisterNumeric {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(tag = "type", rename = "string")]
 pub struct RegisterString {
     length: u8,
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(tag = "type", rename = "array")]
 pub struct RegisterArray {
     count: u8,
@@ -134,7 +132,7 @@ impl Default for RegisterArray {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum RegisterValueType {
     Numeric {
@@ -180,7 +178,7 @@ impl RegisterValueType {
     }
 }
 
-#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Default, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(transparent)]
 pub struct Swap(pub bool);
 
diff --git a/modbus-mqtt/src/modbus/mod.rs b/modbus-mqtt/src/modbus/mod.rs
index daa1a91..644cc08 100644
--- a/modbus-mqtt/src/modbus/mod.rs
+++ b/modbus-mqtt/src/modbus/mod.rs
@@ -124,7 +124,7 @@ impl Register {
     }
 }
 #[cfg(test)]
-use pretty_assertions::{assert_eq, assert_ne};
+use pretty_assertions::assert_eq;
 #[test]
 fn test_parse_1() {
     use self::config::{RegisterParse, Swap};
@@ -147,5 +147,5 @@ fn test_parse_1() {
         },
     };
 
-    assert_eq!(reg.parse_words(&vec![843, 0]), json!(843));
+    assert_eq!(reg.parse_words(&[843, 0]), json!(843));
 }
diff --git a/sungrow-winets/src/lib.rs b/sungrow-winets/src/lib.rs
index e1b153a..234410e 100644
--- a/sungrow-winets/src/lib.rs
+++ b/sungrow-winets/src/lib.rs
@@ -2,7 +2,7 @@ use serde::Deserialize;
 use serde_aux::prelude::*;
 use thiserror::Error;
 use tokio_tungstenite::{connect_async, tungstenite::protocol::Message};
-use tracing::{debug, error, info, instrument};
+use tracing::{debug, error};
 
 #[derive(Error, Debug)]
 #[non_exhaustive]
diff --git a/tokio_modbus-winets/src/service.rs b/tokio_modbus-winets/src/service.rs
index 7a2c89b..9c3089a 100644
--- a/tokio_modbus-winets/src/service.rs
+++ b/tokio_modbus-winets/src/service.rs
@@ -4,7 +4,6 @@ use tokio_modbus::{
     prelude::{Client, Request, Response},
     slave::{Slave, SlaveContext},
 };
-use tracing::{debug, error, info};
 
 pub(crate) async fn connect_slave<H>(host: H, _slave: Slave) -> Result<Context, Error>
 where