Retire the service modules

Author: uklotzde

src/client/rtu.rs

@@ -5,7 +5,7 @@
 
 use tokio::io::{AsyncRead, AsyncWrite};
 
-use crate::service::rtu::{Client, ClientContext};
+use crate::rtu::{Client, ClientContext};
 
 use super::*;
 

src/client/tcp.rs

@@ -43,7 +43,7 @@ pub fn attach_slave<T>(transport: T, slave: Slave) -> Context
 where
     T: AsyncRead + AsyncWrite + Send + Unpin + fmt::Debug + 'static,
 {
-    let client = crate::service::tcp::Client::new(transport, slave);
+    let client = crate::tcp::Client::new(transport, slave);
     Context {
         client: Box::new(client),
     }

src/codec/mod.rs

@@ -26,6 +26,26 @@ pub(crate) mod tcp;
 const MAX_PDU_SIZE: usize = 253;
 
 #[cfg(any(test, feature = "rtu", feature = "tcp"))]
+#[cfg(any(feature = "rtu", feature = "tcp"))]
+pub(crate) async fn disconnect<T, C>(framed: tokio_util::codec::Framed<T, C>) -> std::io::Result<()>
+where
+    T: tokio::io::AsyncWrite + Unpin,
+{
+    use tokio::io::AsyncWriteExt as _;
+
+    framed
+        .into_inner()
+        .shutdown()
+        .await
+        .or_else(|err| match err.kind() {
+            std::io::ErrorKind::NotConnected | std::io::ErrorKind::BrokenPipe => {
+                // Already disconnected.
+                Ok(())
+            }
+            _ => Err(err),
+        })
+}
+
 #[allow(clippy::cast_possible_truncation)]
 fn u16_len(len: usize) -> u16 {
     // This type conversion should always be safe, because either

src/frame/rtu.rs

@@ -3,20 +3,7 @@
 
 use super::*;
 
-use crate::{ProtocolError, Result, Slave};
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct RequestContext {
-    function_code: FunctionCode,
-    header: Header,
-}
-
-impl RequestContext {
-    #[must_use]
-    pub const fn function_code(&self) -> FunctionCode {
-        self.function_code
-    }
-}
+use crate::{rtu::RequestContext, ProtocolError, Result, Slave};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub(crate) struct Header {

src/lib.rs

@@ -39,6 +39,12 @@ pub mod client;
 pub mod slave;
 pub use self::slave::{Slave, SlaveId};
 
+#[cfg(feature = "rtu")]
+pub mod rtu;
+
+#[cfg(feature = "tcp")]
+pub mod tcp;
+
 mod codec;
 
 mod error;
@@ -61,7 +67,5 @@ pub use self::frame::{
 /// 2. [`ExceptionCode`]: An error occurred on the _Modbus_ server.
 pub type Result<T> = std::result::Result<std::result::Result<T, ExceptionCode>, Error>;
 
-mod service;
-
 #[cfg(feature = "server")]
 pub mod server;

src/prelude.rs

@@ -12,8 +12,7 @@ pub use crate::client;
 #[cfg(feature = "rtu")]
 pub mod rtu {
     pub use crate::client::rtu::*;
-    pub use crate::frame::rtu::RequestContext;
-    pub use crate::service::rtu::{Client, ClientContext};
+    pub use crate::rtu::{Client, ClientContext, RequestContext};
 }
 
 #[allow(missing_docs)]

src/service/rtu.rs renamed to src/rtu.rs

@@ -8,13 +8,24 @@ use tokio::io::{AsyncRead, AsyncWrite};
 use tokio_util::codec::Framed;
 
 use crate::{
-    codec,
+    codec::{self, disconnect},
     frame::{rtu::*, *},
     slave::*,
     Result,
 };
 
-use super::disconnect;
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct RequestContext {
+    pub(crate) function_code: FunctionCode,
+    pub(crate) header: Header,
+}
+
+impl RequestContext {
+    #[must_use]
+    pub const fn function_code(&self) -> FunctionCode {
+        self.function_code
+    }
+}
 
 /// _Modbus_ RTU client.
 #[derive(Debug)]

src/service/mod.rs

@@ -8,7 +8,7 @@ use tokio::io::{AsyncRead, AsyncWrite};
 use tokio_util::codec::Framed;
 
 use crate::{
-    codec,
+    codec::{self, disconnect},
     frame::{
         tcp::{Header, RequestAdu, ResponseAdu, TransactionId, UnitId},
         verify_response_header, RequestPdu, ResponsePdu,
@@ -17,8 +17,6 @@ use crate::{
     ExceptionResponse, ProtocolError, Request, Response, Result,
 };
 
-use super::disconnect;
-
 const INITIAL_TRANSACTION_ID: TransactionId = 0;
 
 #[derive(Debug)]