chore: update Rust to 2024 edition (#2066)

This commit is contained in:
Luna Yao
2026-04-09 18:22:12 +02:00
committed by GitHub
parent a8feb9ac2b
commit a879dd1b14
158 changed files with 1327 additions and 1231 deletions
+5 -2
View File
@@ -162,7 +162,10 @@ impl WebClient {
if secure_mode {
connected.store(false, Ordering::Release);
let wait = 1;
log::warn!("secure-mode enabled but server does not support encryption, retrying in {} seconds...", wait);
log::warn!(
"secure-mode enabled but server does not support encryption, retrying in {} seconds...",
wait
);
tokio::time::sleep(std::time::Duration::from_secs(wait)).await;
continue;
}
@@ -238,7 +241,7 @@ pub async fn run_web_client(
#[cfg(test)]
mod tests {
use std::sync::{atomic::AtomicBool, Arc};
use std::sync::{Arc, atomic::AtomicBool};
use crate::instance_manager::NetworkInstanceManager;
+2 -2
View File
@@ -3,14 +3,14 @@ use std::time::Duration;
use bytes::BytesMut;
use futures::{SinkExt, StreamExt};
use snow::{params::NoiseParams, Builder, TransportState};
use snow::{Builder, TransportState, params::NoiseParams};
use crate::{
proto::common::TunnelInfo,
tunnel::{
SplitTunnel, StreamItem, Tunnel, TunnelError, ZCPacketSink, ZCPacketStream,
filter::{TunnelFilter, TunnelWithFilter},
packet_def::{PacketType, ZCPacket, ZCPacketType},
SplitTunnel, StreamItem, Tunnel, TunnelError, ZCPacketSink, ZCPacketStream,
},
};
+1 -1
View File
@@ -1,7 +1,7 @@
use std::sync::{Arc, Weak};
use tokio::{
sync::{broadcast, Mutex},
sync::{Mutex, broadcast},
task::JoinSet,
time::interval,
};