From 0a01012f534b9955610c82b5e49e8bfb730a1c71 Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <markus.kohlhase@slowtec.de>
Date: Wed, 16 Sep 2020 11:21:47 +0200
Subject: [PATCH] Update tokio-util to v0.3.x

---
 Cargo.toml       | 2 +-
 src/codec/rtu.rs | 6 ++----
 src/codec/tcp.rs | 6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ae064309..3568108d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ net2 = { version = "0.2", optional = true, default-features = false }
 smallvec = { version = "1", default-features = false }
 # rt-core should be enabled only with "server" feature. Waiting for https://github.com/rust-lang/cargo/issues/5954
 tokio = { version = "0.2", features = ["rt-core"] }
-tokio-util = { version = "0.2", features = ["codec"] }
+tokio-util = { version = "0.3", features = ["codec"] }
 # Disable default-features to exclude unused dependency on libudev
 tokio-serial = { version = "4.3.3", optional = true, default-features = false }
 
diff --git a/src/codec/rtu.rs b/src/codec/rtu.rs
index 03cbe346..0b037c60 100644
--- a/src/codec/rtu.rs
+++ b/src/codec/rtu.rs
@@ -343,8 +343,7 @@ impl Decoder for ServerCodec {
     }
 }
 
-impl Encoder for ClientCodec {
-    type Item = RequestAdu;
+impl Encoder<RequestAdu> for ClientCodec {
     type Error = Error;
 
     fn encode(&mut self, adu: RequestAdu, buf: &mut BytesMut) -> Result<()> {
@@ -369,8 +368,7 @@ impl Encoder for ClientCodec {
     }
 }
 
-impl Encoder for ServerCodec {
-    type Item = ResponseAdu;
+impl Encoder<ResponseAdu> for ServerCodec {
     type Error = Error;
 
     fn encode(&mut self, adu: ResponseAdu, buf: &mut BytesMut) -> Result<()> {
diff --git a/src/codec/tcp.rs b/src/codec/tcp.rs
index 8ec2eea6..c871033f 100644
--- a/src/codec/tcp.rs
+++ b/src/codec/tcp.rs
@@ -128,8 +128,7 @@ impl Decoder for ServerCodec {
     }
 }
 
-impl Encoder for ClientCodec {
-    type Item = RequestAdu;
+impl Encoder<RequestAdu> for ClientCodec {
     type Error = Error;
 
     fn encode(&mut self, adu: RequestAdu, buf: &mut BytesMut) -> Result<()> {
@@ -154,8 +153,7 @@ impl Encoder for ClientCodec {
     }
 }
 
-impl Encoder for ServerCodec {
-    type Item = ResponseAdu;
+impl Encoder<ResponseAdu> for ServerCodec {
     type Error = Error;
 
     fn encode(&mut self, adu: ResponseAdu, buf: &mut BytesMut) -> Result<()> {