From 44a2c507a3af3b15167f3fd6bbdfdf903ebc9f87 Mon Sep 17 00:00:00 2001 From: Tipragot Date: Sun, 4 Feb 2024 16:51:56 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"R=C3=A9glage=20du=20formatage=20des?= =?UTF-8?q?=20fichiers"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7aff62ecba36a9e8f9c0db2be7bc88bd8b7c02e9. --- src/client.rs | 12 ++++-------- src/lib.rs | 10 +++++----- src/server.rs | 12 ++++-------- src/tcp.rs | 17 +++++++++++------ 4 files changed, 24 insertions(+), 27 deletions(-) diff --git a/src/client.rs b/src/client.rs index a1e8c19..fad3665 100644 --- a/src/client.rs +++ b/src/client.rs @@ -1,17 +1,13 @@ -use std::collections::HashMap; -use std::io; -use std::net::ToSocketAddrs; -use std::sync::Arc; - +use crate::{tcp, Packet}; use bevy::prelude::*; +use std::{collections::HashMap, io, net::ToSocketAddrs, sync::Arc}; + #[cfg(feature = "sync")] -use { +use ::{ serde::{de::DeserializeOwned, Serialize}, std::{any::type_name, marker::PhantomData}, }; -use crate::{tcp, Packet}; - /// A trait for a handler function. pub trait PacketHandlerFn: Fn(Vec, &mut World) + Send + Sync + 'static {} diff --git a/src/lib.rs b/src/lib.rs index 6abcd64..f9849ca 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,8 +1,8 @@ -use std::collections::hash_map::DefaultHasher; -use std::hash::{Hash, Hasher}; - -use serde::de::DeserializeOwned; -use serde::Serialize; +use serde::{de::DeserializeOwned, Serialize}; +use std::{ + collections::hash_map::DefaultHasher, + hash::{Hash, Hasher}, +}; #[cfg(feature = "client")] pub mod client; diff --git a/src/server.rs b/src/server.rs index be2cfe6..f8421c6 100644 --- a/src/server.rs +++ b/src/server.rs @@ -1,17 +1,13 @@ -use std::collections::HashMap; -use std::io; -use std::net::ToSocketAddrs; -use std::sync::Arc; - +use crate::{tcp, Packet}; use bevy::prelude::*; +use std::{collections::HashMap, io, net::ToSocketAddrs, sync::Arc}; + #[cfg(feature = "sync")] -use { +use ::{ serde::{de::DeserializeOwned, Serialize}, std::{any::type_name, marker::PhantomData, ops::Deref}, }; -use crate::{tcp, Packet}; - /// A trait for a handler function. pub trait PacketHandlerFn: Fn(Entity, ClientConnection, Vec, &mut World) + Send + Sync + 'static diff --git a/src/tcp.rs b/src/tcp.rs index 66bf170..0905256 100644 --- a/src/tcp.rs +++ b/src/tcp.rs @@ -1,11 +1,16 @@ -use std::io::{self, Read, Write}; +use std::{ + io::{self, Read, Write}, + net::{Shutdown, TcpStream, ToSocketAddrs}, + sync::{ + atomic::{AtomicBool, Ordering}, + mpsc::{channel, Receiver, Sender}, + Arc, Mutex, + }, + thread, +}; + #[cfg(feature = "server")] use std::net::TcpListener; -use std::net::{Shutdown, TcpStream, ToSocketAddrs}; -use std::sync::atomic::{AtomicBool, Ordering}; -use std::sync::mpsc::{channel, Receiver, Sender}; -use std::sync::{Arc, Mutex}; -use std::thread; /// A non-blocking TCP connection. pub struct Connection {