chore: update Rust to 2024 edition (#2066)

easytier/src/proto/rpc_impl/bidirect.rs

@@ -1,4 +1,4 @@
-use std::sync::{atomic::AtomicBool, Arc, Mutex};
+use std::sync::{Arc, Mutex, atomic::AtomicBool};
 
 use futures::{SinkExt as _, StreamExt};
 use tokio::{task::JoinSet, time::timeout};
@@ -6,7 +6,7 @@ use tokio::{task::JoinSet, time::timeout};
 use crate::{
     defer,
     proto::rpc_types::error::Error,
-    tunnel::{packet_def::PacketType, ring::create_ring_tunnel_pair, Tunnel},
+    tunnel::{Tunnel, packet_def::PacketType, ring::create_ring_tunnel_pair},
 };
 
 use super::{client::Client, server::Server, service_registry::ServiceRegistry};

easytier/src/proto/rpc_impl/client.rs

@@ -12,15 +12,15 @@ use tokio_stream::StreamExt;
 
 use crate::common::shrink_dashmap;
 use crate::common::{
-    stats_manager::{LabelSet, LabelType, MetricName, StatsManager},
     PeerId,
+    stats_manager::{LabelSet, LabelType, MetricName, StatsManager},
 };
 use crate::defer;
 use crate::proto::common::{
     CompressionAlgoPb, RpcCompressionInfo, RpcDescriptor, RpcPacket, RpcRequest, RpcResponse,
 };
 use crate::proto::rpc_impl::packet::{
-    build_rpc_packet, compress_packet, decompress_packet, BuildRpcPacketArgs,
+    BuildRpcPacketArgs, build_rpc_packet, compress_packet, decompress_packet,
 };
 use crate::proto::rpc_types::controller::Controller;
 use crate::proto::rpc_types::descriptor::MethodDescriptor;

easytier/src/proto/rpc_impl/mod.rs

@@ -1,4 +1,4 @@
-use crate::tunnel::{mpsc::MpscTunnel, Tunnel};
+use crate::tunnel::{Tunnel, mpsc::MpscTunnel};
 
 pub type RpcController = super::rpc_types::controller::BaseController;
 

easytier/src/proto/rpc_impl/packet.rs

@@ -1,7 +1,7 @@
 use prost::Message as _;
 
 use crate::{
-    common::{compressor::DefaultCompressor, PeerId},
+    common::{PeerId, compressor::DefaultCompressor},
     proto::{
         common::{CompressionAlgoPb, RpcCompressionInfo, RpcDescriptor, RpcPacket},
         rpc_types::error::Error,

easytier/src/proto/rpc_impl/server.rs

@@ -11,9 +11,8 @@ use tokio_stream::StreamExt;
 
 use crate::{
     common::{
-        join_joinset_background,
+        PeerId, join_joinset_background,
         stats_manager::{LabelSet, LabelType, MetricName, StatsManager},
-        PeerId,
     },
     proto::{
         common::{
@@ -24,16 +23,16 @@ use crate::{
         rpc_types::{controller::Controller, error::Result},
     },
     tunnel::{
+        Tunnel, ZCPacketStream,
         mpsc::{MpscTunnel, MpscTunnelSender},
         ring::create_ring_tunnel_pair,
-        Tunnel, ZCPacketStream,
     },
 };
 
 use super::{
-    packet::{build_rpc_packet, compress_packet, decompress_packet, PacketMerger},
-    service_registry::ServiceRegistry,
     RpcController, Transport,
+    packet::{PacketMerger, build_rpc_packet, compress_packet, decompress_packet},
+    service_registry::ServiceRegistry,
 };
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]

easytier/src/proto/rpc_impl/standalone.rs

@@ -1,5 +1,5 @@
 use std::{
-    sync::{atomic::AtomicU32, Arc, Mutex},
+    sync::{Arc, Mutex, atomic::AtomicU32},
     time::Duration,
 };
 
@@ -204,8 +204,8 @@ mod tests {
     use crate::{
         proto::rpc_impl::standalone::StandAloneServer,
         tunnel::{
-            tcp::{TcpTunnelConnector, TcpTunnelListener},
             TunnelConnector as _,
+            tcp::{TcpTunnelConnector, TcpTunnelListener},
         },
     };