cargo fmt

Signed-off-by: Matthew Fisher <[email protected]>

Author: bacongobbler

examples/chat_client.rs

@@ -1,7 +1,9 @@
 use std::net::{SocketAddr, UdpSocket};
 
 use bevy::{log::LogPlugin, prelude::*};
-use bevy_simple_networking::{ClientPlugin, NetworkEvent, SocketAddrResource, Transport, UdpSocketResource};
+use bevy_simple_networking::{
+    ClientPlugin, NetworkEvent, SocketAddrResource, Transport, UdpSocketResource,
+};
 
 fn main() {
     let remote_addr: SocketAddr = "127.0.0.1:4567".parse().expect("could not parse addr");

examples/chat_server.rs

@@ -1,7 +1,14 @@
 use std::{net::UdpSocket, time::Duration};
 
-use bevy::{app::{App, ScheduleRunnerPlugin, Update}, log::{info, LogPlugin}, prelude::*, MinimalPlugins};
-use bevy_simple_networking::{NetworkEvent, NetworkResource, ServerPlugin, Transport, UdpSocketResource};
+use bevy::{
+    app::{App, ScheduleRunnerPlugin, Update},
+    log::{info, LogPlugin},
+    prelude::*,
+    MinimalPlugins,
+};
+use bevy_simple_networking::{
+    NetworkEvent, NetworkResource, ServerPlugin, Transport, UdpSocketResource,
+};
 
 const LISTEN_ADDRESS: &str = "127.0.0.1:4567";
 
@@ -17,10 +24,12 @@ fn main() {
     info!("Server now listening on {}", LISTEN_ADDRESS);
 
     App::new()
-    .insert_resource(UdpSocketResource::new(socket))
-    .add_plugins((
+        .insert_resource(UdpSocketResource::new(socket))
+        .add_plugins((
             // run the server at a reduced tick rate (35 ticks per second)
-            MinimalPlugins.set(ScheduleRunnerPlugin::run_loop(Duration::from_secs_f32(1. / 35.))),
+            MinimalPlugins.set(ScheduleRunnerPlugin::run_loop(Duration::from_secs_f32(
+                1. / 35.,
+            ))),
             LogPlugin::default(),
             ServerPlugin,
         ))

examples/simple_client.rs

@@ -30,7 +30,8 @@ fn connection_handler(mut events: EventReader<NetworkEvent>) {
             NetworkEvent::SendError(err, msg) => {
                 error!(
                     "NetworkEvent::SendError (payload [{:?}]): {:?}",
-                    String::from_utf8_lossy(&msg.payload), err
+                    String::from_utf8_lossy(&msg.payload),
+                    err
                 );
             }
             NetworkEvent::RecvError(err) => {

examples/simple_server.rs

@@ -20,9 +20,11 @@ fn main() {
         .insert_resource(UdpSocketResource::new(socket))
         .add_plugins((
             // run the server at a reduced tick rate (100 ticks per minute)
-            MinimalPlugins.set(ScheduleRunnerPlugin::run_loop(Duration::from_secs_f32(60. / 100.))),
+            MinimalPlugins.set(ScheduleRunnerPlugin::run_loop(Duration::from_secs_f32(
+                60. / 100.,
+            ))),
             LogPlugin::default(),
-            ServerPlugin
+            ServerPlugin,
         ))
         .add_systems(Update, connection_handler)
         .run();
@@ -39,12 +41,17 @@ fn connection_handler(mut events: EventReader<NetworkEvent>, mut transport: ResM
                 info!("{}: disconnected!", handle);
             }
             NetworkEvent::Message(handle, msg) => {
-                info!("{} sent a message: {:?}", handle, String::from_utf8_lossy(msg));
+                info!(
+                    "{} sent a message: {:?}",
+                    handle,
+                    String::from_utf8_lossy(msg)
+                );
             }
             NetworkEvent::SendError(err, msg) => {
                 error!(
                     "NetworkEvent::SendError (payload [{:?}]): {:?}",
-                    String::from_utf8_lossy(&msg.payload), err
+                    String::from_utf8_lossy(&msg.payload),
+                    err
                 );
             }
             NetworkEvent::RecvError(err) => {

src/lib.rs

@@ -67,8 +67,8 @@ impl Plugin for ServerPlugin {
                 (
                     systems::server_recv_packet_system.in_set(NetworkSystem::Receive),
                     systems::send_packet_system.in_set(NetworkSystem::Send),
-                    systems::idle_timeout_system.in_set(ServerSystem::IdleTimeout)
-                )
+                    systems::idle_timeout_system.in_set(ServerSystem::IdleTimeout),
+                ),
             );
     }
 }
@@ -91,8 +91,8 @@ impl Plugin for ClientPlugin {
                 (
                     systems::client_recv_packet_system.in_set(NetworkSystem::Receive),
                     systems::send_packet_system.in_set(NetworkSystem::Send),
-                    systems::auto_heartbeat_system.in_set(ClientSystem::Heartbeat)
-                )
+                    systems::auto_heartbeat_system.in_set(ClientSystem::Heartbeat),
+                ),
             );
     }
 }

src/systems.rs

@@ -1,6 +1,7 @@
 use std::{
     io,
-    net::{SocketAddr, UdpSocket}, ops::Deref,
+    net::{SocketAddr, UdpSocket},
+    ops::Deref,
 };
 
 use bevy::prelude::*;
@@ -44,7 +45,10 @@ impl SocketAddrResource {
     }
 }
 
-pub fn client_recv_packet_system(socket: Res<UdpSocketResource>, mut events: EventWriter<NetworkEvent>) {
+pub fn client_recv_packet_system(
+    socket: Res<UdpSocketResource>,
+    mut events: EventWriter<NetworkEvent>,
+) {
     loop {
         let mut buf = [0; 512];
         match socket.recv_from(&mut buf) {
@@ -80,11 +84,7 @@ pub fn server_recv_packet_system(
         match socket.recv_from(&mut buf) {
             Ok((recv_len, address)) => {
                 let payload = Bytes::copy_from_slice(&buf[..recv_len]);
-                if net
-                    .connections
-                    .insert(address, time.elapsed())
-                    .is_none()
-                {
+                if net.connections.insert(address, time.elapsed()).is_none() {
                     // connection established
                     events.send(NetworkEvent::Connected(address));
                 }