Fix latest clippy errors
parent
69ada6e861
commit
c664117971
|
@ -1,8 +1,6 @@
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
use pretty_assertions::{assert_eq, assert_ne};
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
use serde_json::json;
|
use serde_json::json;
|
||||||
|
|
||||||
|
@ -57,7 +55,7 @@ fn default_modbus_parity() -> tokio_serial::Parity {
|
||||||
tokio_serial::Parity::None
|
tokio_serial::Parity::None
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
|
#[derive(Clone, Default, Debug, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
#[serde(rename_all = "lowercase", default)]
|
#[serde(rename_all = "lowercase", default)]
|
||||||
pub struct RegisterNumericAdjustment {
|
pub struct RegisterNumericAdjustment {
|
||||||
pub scale: i8, // powers of 10 (0 = no adjustment, 1 = x10, -1 = /10)
|
pub scale: i8, // powers of 10 (0 = no adjustment, 1 = x10, -1 = /10)
|
||||||
|
@ -65,7 +63,7 @@ pub struct RegisterNumericAdjustment {
|
||||||
// precision: Option<u8>,
|
// precision: Option<u8>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
|
#[derive(Clone, Default, Debug, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
#[serde(rename_all = "lowercase")]
|
#[serde(rename_all = "lowercase")]
|
||||||
pub enum RegisterNumeric {
|
pub enum RegisterNumeric {
|
||||||
U8,
|
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")]
|
#[serde(tag = "type", rename = "string")]
|
||||||
pub struct RegisterString {
|
pub struct RegisterString {
|
||||||
length: u8,
|
length: u8,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
#[serde(tag = "type", rename = "array")]
|
#[serde(tag = "type", rename = "array")]
|
||||||
pub struct RegisterArray {
|
pub struct RegisterArray {
|
||||||
count: u8,
|
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)]
|
#[serde(untagged)]
|
||||||
pub enum RegisterValueType {
|
pub enum RegisterValueType {
|
||||||
Numeric {
|
Numeric {
|
||||||
|
@ -180,7 +178,7 @@ impl RegisterValueType {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
|
#[derive(Clone, Default, Debug, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
#[serde(transparent)]
|
#[serde(transparent)]
|
||||||
pub struct Swap(pub bool);
|
pub struct Swap(pub bool);
|
||||||
|
|
||||||
|
|
|
@ -124,7 +124,7 @@ impl Register {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
use pretty_assertions::{assert_eq, assert_ne};
|
use pretty_assertions::assert_eq;
|
||||||
#[test]
|
#[test]
|
||||||
fn test_parse_1() {
|
fn test_parse_1() {
|
||||||
use self::config::{RegisterParse, Swap};
|
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));
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@ use serde::Deserialize;
|
||||||
use serde_aux::prelude::*;
|
use serde_aux::prelude::*;
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
use tokio_tungstenite::{connect_async, tungstenite::protocol::Message};
|
use tokio_tungstenite::{connect_async, tungstenite::protocol::Message};
|
||||||
use tracing::{debug, error, info, instrument};
|
use tracing::{debug, error};
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
#[derive(Error, Debug)]
|
||||||
#[non_exhaustive]
|
#[non_exhaustive]
|
||||||
|
|
|
@ -4,7 +4,6 @@ use tokio_modbus::{
|
||||||
prelude::{Client, Request, Response},
|
prelude::{Client, Request, Response},
|
||||||
slave::{Slave, SlaveContext},
|
slave::{Slave, SlaveContext},
|
||||||
};
|
};
|
||||||
use tracing::{debug, error, info};
|
|
||||||
|
|
||||||
pub(crate) async fn connect_slave<H>(host: H, _slave: Slave) -> Result<Context, Error>
|
pub(crate) async fn connect_slave<H>(host: H, _slave: Slave) -> Result<Context, Error>
|
||||||
where
|
where
|
||||||
|
|
Loading…
Reference in New Issue