chore: update Rust to 2024 edition (#2066)

easytier/src/gateway/tokio_smoltcp/channel_device.rs

@@ -5,7 +5,7 @@ use std::{
     pin::Pin,
     task::{Context, Poll},
 };
-use tokio::sync::mpsc::{channel, Receiver, Sender};
+use tokio::sync::mpsc::{Receiver, Sender, channel};
 use tokio_util::sync::{PollSendError, PollSender};
 
 use super::device::AsyncDevice;

easytier/src/gateway/tokio_smoltcp/mod.rs

@@ -6,8 +6,8 @@ use std::{
     io,
     net::{IpAddr, SocketAddr},
     sync::{
-        atomic::{AtomicU16, Ordering},
         Arc,
+        atomic::{AtomicU16, Ordering},
     },
 };
 

easytier/src/gateway/tokio_smoltcp/reactor.rs

@@ -2,7 +2,7 @@ use super::{
     device::{BufferDevice, Packet},
     socket_allocator::{BufferSize, SocketAlloctor},
 };
-use futures::{stream::iter, FutureExt, SinkExt, StreamExt};
+use futures::{FutureExt, SinkExt, StreamExt, stream::iter};
 use parking_lot::{MappedMutexGuard, Mutex, MutexGuard};
 use smoltcp::{
     iface::{Context, Interface, SocketHandle},
@@ -92,10 +92,10 @@ async fn run(
 
         // wake up all closed sockets (smoltcp seems have a bug that it doesn't wake up closed sockets)
         for (_, socket) in socket_allocator.sockets().lock().iter_mut() {
-            if let Socket::Tcp(tcp) = socket {
-                if tcp.state() == smoltcp::socket::tcp::State::Closed {
-                    tcp.abort();
-                }
+            if let Socket::Tcp(tcp) = socket
+                && tcp.state() == smoltcp::socket::tcp::State::Closed
+            {
+                tcp.abort();
             }
         }
     }

easytier/src/gateway/tokio_smoltcp/socket.rs

@@ -1,6 +1,6 @@
 use super::{reactor::Reactor, socket_allocator::SocketHandle};
 use futures::future::{self, poll_fn};
-use futures::{ready, Stream};
+use futures::{Stream, ready};
 pub use smoltcp::socket::tcp;
 use smoltcp::socket::udp;
 use smoltcp::wire::{IpAddress, IpEndpoint};

easytier/src/gateway/tokio_smoltcp/socket_allocator.rs

@@ -85,9 +85,8 @@ impl SocketAlloctor {
             vec![udp::PacketMetadata::EMPTY; self.buffer_size.udp_tx_meta_size],
             vec![0; self.buffer_size.udp_tx_size],
         );
-        let udp = udp::Socket::new(rx_buffer, tx_buffer);
 
-        udp
+        udp::Socket::new(rx_buffer, tx_buffer)
     }
 }