Simplify imports

uklotzde · Sep 10, 2024 · e224e74 · e224e74
1 parent 25521a8
commit e224e74
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/src/client/sync/mod.rs b/src/client/sync/mod.rs
@@ -16,8 +16,7 @@ use futures_util::future::Either;
 use crate::{frame::*, Result, Slave};
 
 use super::{
-    Client as AsyncClient, Context as AsyncContext, Reader as AsyncReader, SlaveContext,
-    Writer as AsyncWriter,
+    Client as AsyncClient, Context as AsyncContext, Reader as _, SlaveContext, Writer as _,
 };
 
 fn block_on_with_timeout<T, E>(

diff --git a/src/prelude.rs b/src/prelude.rs
@@ -29,8 +29,7 @@ pub mod sync {
 ///////////////////////////////////////////////////////////////////
 /// Types
 ///////////////////////////////////////////////////////////////////
-pub use crate::{Exception, ProtocolError, Request, Response};
-pub use crate::{Slave, SlaveId};
+pub use crate::{Exception, ProtocolError, Request, Response, Slave, SlaveId};
 
 #[cfg(feature = "server")]
 pub use crate::frame::SlaveRequest;

diff --git a/tests/exception/mod.rs b/tests/exception/mod.rs
@@ -4,7 +4,7 @@
 use std::future;
 
 use tokio_modbus::{
-    client::{Context, Reader, Writer},
+    client::{Context, Reader as _, Writer as _},
     server::Service,
     Exception, Request, Response,
 };

diff --git a/tests/rtu_all_exceptions.rs b/tests/rtu_all_exceptions.rs
@@ -10,10 +10,7 @@ mod exception;
 use std::{thread, time::Duration};
 
 use exception::check_client_context;
-use tokio_modbus::{
-    client::{self},
-    server::rtu::Server,
-};
+use tokio_modbus::{client, server::rtu::Server};
 use tokio_serial::SerialPortBuilder;
 
 use crate::exception::TestService;

diff --git a/tests/tcp_all_exceptions.rs b/tests/tcp_all_exceptions.rs
@@ -12,7 +12,7 @@ use std::{net::SocketAddr, time::Duration};
 use exception::check_client_context;
 use tokio::net::TcpListener;
 use tokio_modbus::{
-    client::{self},
+    client,
     server::tcp::{accept_tcp_connection, Server},
 };