diff options
4 files changed, 8 insertions, 20 deletions
diff --git a/crates/utils/tcp_connection/src/handle.rs b/crates/utils/tcp_connection/src/handle.rs index 706d386..ee77b43 100644 --- a/crates/utils/tcp_connection/src/handle.rs +++ b/crates/utils/tcp_connection/src/handle.rs @@ -2,9 +2,9 @@ use crate::instance::ConnectionInstance; use std::future::Future; pub trait ClientHandle<RequestServer> { - fn process(instance: ConnectionInstance) -> impl Future<Output = ()> + Send + Sync; + fn process(instance: ConnectionInstance) -> impl Future<Output = ()> + Send; } pub trait ServerHandle<RequestClient> { - fn process(instance: ConnectionInstance) -> impl Future<Output = ()> + Send + Sync; + fn process(instance: ConnectionInstance) -> impl Future<Output = ()> + Send; } diff --git a/crates/utils/tcp_connection/tcp_connection_test/src/test_challenge.rs b/crates/utils/tcp_connection/tcp_connection_test/src/test_challenge.rs index 05e47ad..0ca8540 100644 --- a/crates/utils/tcp_connection/tcp_connection_test/src/test_challenge.rs +++ b/crates/utils/tcp_connection/tcp_connection_test/src/test_challenge.rs @@ -14,9 +14,7 @@ use tokio::{ pub(crate) struct ExampleChallengeClientHandle; impl ClientHandle<ExampleChallengeServerHandle> for ExampleChallengeClientHandle { - fn process( - mut instance: ConnectionInstance, - ) -> impl std::future::Future<Output = ()> + Send + Sync { + fn process(mut instance: ConnectionInstance) -> impl std::future::Future<Output = ()> + Send { async move { // Accept challenge with correct key let key = current_dir() @@ -69,9 +67,7 @@ impl ClientHandle<ExampleChallengeServerHandle> for ExampleChallengeClientHandle pub(crate) struct ExampleChallengeServerHandle; impl ServerHandle<ExampleChallengeClientHandle> for ExampleChallengeServerHandle { - fn process( - mut instance: ConnectionInstance, - ) -> impl std::future::Future<Output = ()> + Send + Sync { + fn process(mut instance: ConnectionInstance) -> impl std::future::Future<Output = ()> + Send { async move { // Challenge with correct key let key_dir = current_dir().unwrap().join("res").join("key"); diff --git a/crates/utils/tcp_connection/tcp_connection_test/src/test_connection.rs b/crates/utils/tcp_connection/tcp_connection_test/src/test_connection.rs index bbea92f..6238c39 100644 --- a/crates/utils/tcp_connection/tcp_connection_test/src/test_connection.rs +++ b/crates/utils/tcp_connection/tcp_connection_test/src/test_connection.rs @@ -11,9 +11,7 @@ use tokio::{join, time::sleep}; pub(crate) struct ExampleClientHandle; impl ClientHandle<ExampleServerHandle> for ExampleClientHandle { - fn process( - mut instance: ConnectionInstance, - ) -> impl std::future::Future<Output = ()> + Send + Sync { + fn process(mut instance: ConnectionInstance) -> impl std::future::Future<Output = ()> + Send { async move { // Write name let Ok(_) = instance.write_text("Peter").await else { @@ -31,9 +29,7 @@ impl ClientHandle<ExampleServerHandle> for ExampleClientHandle { pub(crate) struct ExampleServerHandle; impl ServerHandle<ExampleClientHandle> for ExampleServerHandle { - fn process( - mut instance: ConnectionInstance, - ) -> impl std::future::Future<Output = ()> + Send + Sync { + fn process(mut instance: ConnectionInstance) -> impl std::future::Future<Output = ()> + Send { async move { // Read name let Ok(name) = instance.read_text().await else { diff --git a/crates/utils/tcp_connection/tcp_connection_test/src/test_file_transfer.rs b/crates/utils/tcp_connection/tcp_connection_test/src/test_file_transfer.rs index 94b77c4..d316080 100644 --- a/crates/utils/tcp_connection/tcp_connection_test/src/test_file_transfer.rs +++ b/crates/utils/tcp_connection/tcp_connection_test/src/test_file_transfer.rs @@ -14,9 +14,7 @@ use tokio::{ pub(crate) struct ExampleFileTransferClientHandle; impl ClientHandle<ExampleFileTransferServerHandle> for ExampleFileTransferClientHandle { - fn process( - mut instance: ConnectionInstance, - ) -> impl std::future::Future<Output = ()> + Send + Sync { + fn process(mut instance: ConnectionInstance) -> impl std::future::Future<Output = ()> + Send { async move { let image_path = current_dir() .unwrap() @@ -31,9 +29,7 @@ impl ClientHandle<ExampleFileTransferServerHandle> for ExampleFileTransferClient pub(crate) struct ExampleFileTransferServerHandle; impl ServerHandle<ExampleFileTransferClientHandle> for ExampleFileTransferServerHandle { - fn process( - mut instance: ConnectionInstance, - ) -> impl std::future::Future<Output = ()> + Send + Sync { + fn process(mut instance: ConnectionInstance) -> impl std::future::Future<Output = ()> + Send { async move { let save_path = current_dir() .unwrap() |