From f8410cc329d1e8b50bd9b4a41faa14f574da54f9 Mon Sep 17 00:00:00 2001 From: zonyitoo Date: Sun, 14 Apr 2024 22:08:08 +0800 Subject: [PATCH] chore: reformatted with nightlly rustc --- crates/shadowsocks-service/src/config.rs | 9 ++++++++- .../shadowsocks-service/src/local/fake_dns/processor.rs | 5 ++++- .../src/local/loadbalancing/ping_balancer.rs | 3 +-- .../shadowsocks-service/src/local/net/udp/association.rs | 4 +++- crates/shadowsocks/src/net/sys/unix/others.rs | 2 +- src/service/local.rs | 6 +++++- 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/crates/shadowsocks-service/src/config.rs b/crates/shadowsocks-service/src/config.rs index 11f61440..46820e94 100644 --- a/crates/shadowsocks-service/src/config.rs +++ b/crates/shadowsocks-service/src/config.rs @@ -70,7 +70,14 @@ use serde::{Deserialize, Serialize}; use shadowsocks::relay::socks5::Address; use shadowsocks::{ config::{ - ManagerAddr, Mode, ReplayAttackPolicy, ServerAddr, ServerConfig, ServerUser, ServerUserManager, ServerWeight, + ManagerAddr, + Mode, + ReplayAttackPolicy, + ServerAddr, + ServerConfig, + ServerUser, + ServerUserManager, + ServerWeight, }, crypto::CipherKind, plugin::PluginConfig, diff --git a/crates/shadowsocks-service/src/local/fake_dns/processor.rs b/crates/shadowsocks-service/src/local/fake_dns/processor.rs index fb730ace..9ea70740 100644 --- a/crates/shadowsocks-service/src/local/fake_dns/processor.rs +++ b/crates/shadowsocks-service/src/local/fake_dns/processor.rs @@ -6,7 +6,10 @@ use hickory_resolver::proto::{ op::{header::MessageType, response_code::ResponseCode, Message, OpCode}, rr::{ rdata::{A, AAAA}, - DNSClass, RData, Record, RecordType, + DNSClass, + RData, + Record, + RecordType, }, }; use log::{debug, trace}; diff --git a/crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs b/crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs index b31e24f7..ebe3e12b 100644 --- a/crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs +++ b/crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs @@ -35,8 +35,7 @@ use tokio::{ time, }; -use crate::config::ServerInstanceConfig; -use crate::local::context::ServiceContext; +use crate::{config::ServerInstanceConfig, local::context::ServiceContext}; use super::{ server_data::ServerIdent, diff --git a/crates/shadowsocks-service/src/local/net/udp/association.rs b/crates/shadowsocks-service/src/local/net/udp/association.rs index 758db7d5..49b99671 100644 --- a/crates/shadowsocks-service/src/local/net/udp/association.rs +++ b/crates/shadowsocks-service/src/local/net/udp/association.rs @@ -29,7 +29,9 @@ use shadowsocks::{ use crate::{ local::{context::ServiceContext, loadbalancing::PingBalancer}, net::{ - packet_window::PacketWindowFilter, MonProxySocket, UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE, + packet_window::PacketWindowFilter, + MonProxySocket, + UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE, UDP_ASSOCIATION_SEND_CHANNEL_SIZE, }, }; diff --git a/crates/shadowsocks/src/net/sys/unix/others.rs b/crates/shadowsocks/src/net/sys/unix/others.rs index e68ea864..a8cf4c89 100644 --- a/crates/shadowsocks/src/net/sys/unix/others.rs +++ b/crates/shadowsocks/src/net/sys/unix/others.rs @@ -14,7 +14,7 @@ use tokio::{ }; use crate::net::{ - sys::{ErrorKind, set_common_sockopt_after_connect, set_common_sockopt_for_connect}, + sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, ErrorKind}, AcceptOpts, AddrFamily, ConnectOpts, diff --git a/src/service/local.rs b/src/service/local.rs index 1bedcaa1..c4ef99ac 100644 --- a/src/service/local.rs +++ b/src/service/local.rs @@ -991,7 +991,11 @@ fn launch_reload_server_task(config_path: PathBuf, balancer: PingBalancer) { } }; - info!("auto-reload {} with {} servers", config_path.display(), config.server.len()); + info!( + "auto-reload {} with {} servers", + config_path.display(), + config.server.len() + ); if let Err(err) = balancer.reset_servers(config.server).await { error!("auto-reload {} but found error: {}", config_path.display(), err);