Skip to content

Commit 876f0a3

Browse files
authored
Remove unused trait impls (#286)
1 parent f68a4a3 commit 876f0a3

File tree

6 files changed

+22
-31
lines changed

6 files changed

+22
-31
lines changed

src/codec/rtu.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const MAX_FRAME_LEN: usize = 256;
2121

2222
type DroppedBytes = SmallVec<[u8; MAX_FRAME_LEN]>;
2323

24-
#[derive(Debug, Eq, PartialEq)]
24+
#[derive(Debug)]
2525
pub(crate) struct FrameDecoder {
2626
dropped_bytes: SmallVec<[u8; MAX_FRAME_LEN]>,
2727
}
@@ -104,23 +104,23 @@ impl FrameDecoder {
104104
}
105105

106106
#[cfg(feature = "server")]
107-
#[derive(Debug, Default, Eq, PartialEq)]
107+
#[derive(Debug, Default)]
108108
pub(crate) struct RequestDecoder {
109109
frame_decoder: FrameDecoder,
110110
}
111111

112-
#[derive(Debug, Default, Eq, PartialEq)]
112+
#[derive(Debug, Default)]
113113
pub(crate) struct ResponseDecoder {
114114
frame_decoder: FrameDecoder,
115115
}
116116

117-
#[derive(Debug, Default, Eq, PartialEq)]
117+
#[derive(Debug, Default)]
118118
pub(crate) struct ClientCodec {
119119
pub(crate) decoder: ResponseDecoder,
120120
}
121121

122122
#[cfg(feature = "server")]
123-
#[derive(Debug, Default, Eq, PartialEq)]
123+
#[derive(Debug, Default)]
124124
pub(crate) struct ServerCodec {
125125
pub(crate) decoder: RequestDecoder,
126126
}

src/codec/tcp.rs

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,37 +17,28 @@ const HEADER_LEN: usize = 7;
1717

1818
const PROTOCOL_ID: u16 = 0x0000; // TCP
1919

20-
#[derive(Debug, PartialEq)]
20+
#[derive(Debug, Default)]
2121
pub(crate) struct AduDecoder;
2222

23-
#[derive(Debug, PartialEq)]
23+
#[derive(Debug)]
2424
pub(crate) struct ClientCodec {
2525
pub(crate) decoder: AduDecoder,
2626
}
2727

28-
impl Default for ClientCodec {
29-
fn default() -> Self {
28+
impl ClientCodec {
29+
pub(crate) const fn new() -> Self {
3030
Self {
3131
decoder: AduDecoder,
3232
}
3333
}
3434
}
3535

3636
#[cfg(feature = "server")]
37-
#[derive(Debug, PartialEq)]
37+
#[derive(Debug, Default)]
3838
pub(crate) struct ServerCodec {
3939
pub(crate) decoder: AduDecoder,
4040
}
4141

42-
#[cfg(feature = "server")]
43-
impl Default for ServerCodec {
44-
fn default() -> Self {
45-
Self {
46-
decoder: AduDecoder,
47-
}
48-
}
49-
}
50-
5142
impl Decoder for AduDecoder {
5243
type Item = (Header, Bytes);
5344
type Error = Error;
@@ -185,7 +176,7 @@ mod tests {
185176

186177
#[test]
187178
fn decode_header_fragment() {
188-
let mut codec = ClientCodec::default();
179+
let mut codec = ClientCodec::new();
189180
let mut buf = BytesMut::from(&[0x00, 0x11, 0x00, 0x00, 0x00, 0x00][..]);
190181
let res = codec.decode(&mut buf).unwrap();
191182
assert!(res.is_none());
@@ -194,7 +185,7 @@ mod tests {
194185

195186
#[test]
196187
fn decode_partly_received_message() {
197-
let mut codec = ClientCodec::default();
188+
let mut codec = ClientCodec::new();
198189
let mut buf = BytesMut::from(
199190
&[
200191
TRANSACTION_ID_HI,
@@ -214,7 +205,7 @@ mod tests {
214205

215206
#[test]
216207
fn decode_exception_message() {
217-
let mut codec = ClientCodec::default();
208+
let mut codec = ClientCodec::new();
218209
let mut buf = BytesMut::from(
219210
&[
220211
TRANSACTION_ID_HI,
@@ -243,7 +234,7 @@ mod tests {
243234

244235
#[test]
245236
fn decode_with_invalid_protocol_id() {
246-
let mut codec = ClientCodec::default();
237+
let mut codec = ClientCodec::new();
247238
let mut buf = BytesMut::from(
248239
&[
249240
TRANSACTION_ID_HI,
@@ -263,7 +254,7 @@ mod tests {
263254

264255
#[test]
265256
fn encode_read_request() {
266-
let mut codec = ClientCodec::default();
257+
let mut codec = ClientCodec::new();
267258
let mut buf = BytesMut::new();
268259
let req = Request::ReadInputRegisters(0x23, 5);
269260
let pdu = req.clone().into();
@@ -289,7 +280,7 @@ mod tests {
289280

290281
#[test]
291282
fn encode_with_limited_buf_capacity() {
292-
let mut codec = ClientCodec::default();
283+
let mut codec = ClientCodec::new();
293284
let pdu = Request::ReadInputRegisters(0x23, 5).into();
294285
let hdr = Header {
295286
transaction_id: TRANSACTION_ID,

src/frame/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ pub struct ExceptionResponse {
502502
}
503503

504504
/// Represents a message from the client (slave) to the server (master).
505-
#[derive(Debug, Clone, PartialEq, Eq)]
505+
#[derive(Debug, Clone)]
506506
pub(crate) struct RequestPdu<'a>(pub(crate) Request<'a>);
507507

508508
impl<'a> From<Request<'a>> for RequestPdu<'a> {

src/frame/rtu.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ pub(crate) struct Header {
1010
pub(crate) slave_id: SlaveId,
1111
}
1212

13-
#[derive(Debug, Clone, PartialEq, Eq)]
13+
#[derive(Debug, Clone)]
1414
pub struct RequestAdu<'a> {
1515
pub(crate) hdr: Header,
1616
pub(crate) pdu: RequestPdu<'a>,
1717
}
1818

19-
#[derive(Debug, Clone, PartialEq, Eq)]
19+
#[derive(Debug, Clone)]
2020
pub(crate) struct ResponseAdu {
2121
pub(crate) hdr: Header,
2222
pub(crate) pdu: ResponsePdu,

src/frame/tcp.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ pub(crate) struct Header {
1212
pub(crate) unit_id: UnitId,
1313
}
1414

15-
#[derive(Debug, Clone, PartialEq, Eq)]
15+
#[derive(Debug, Clone)]
1616
pub struct RequestAdu<'a> {
1717
pub(crate) hdr: Header,
1818
pub(crate) pdu: RequestPdu<'a>,
1919
}
2020

21-
#[derive(Debug, Clone, PartialEq, Eq)]
21+
#[derive(Debug, Clone)]
2222
pub(crate) struct ResponseAdu {
2323
pub(crate) hdr: Header,
2424
pub(crate) pdu: ResponsePdu,

src/service/tcp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ where
3333
T: AsyncRead + AsyncWrite + Unpin,
3434
{
3535
pub(crate) fn new(transport: T, slave: Slave) -> Self {
36-
let framed = Framed::new(transport, codec::tcp::ClientCodec::default());
36+
let framed = Framed::new(transport, codec::tcp::ClientCodec::new());
3737
let unit_id: UnitId = slave.into();
3838
let transaction_id = AtomicU16::new(INITIAL_TRANSACTION_ID);
3939
Self {

0 commit comments

Comments
 (0)