From f3c9ecd2b373cf11d87a802f6b163176fe24cdad Mon Sep 17 00:00:00 2001
From: zonyitoo <zonyitoo@gmail.com>
Date: Sat, 18 May 2024 23:52:08 +0800
Subject: [PATCH] chore: reformatted with nightlly rustc

---
 .../src/local/redir/sys/unix/bsd_pf.rs             | 11 +++++------
 .../src/local/redir/udprelay/sys/unix/bsd.rs       | 14 +++++---------
 src/service/local.rs                               | 10 ++++++++--
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/crates/shadowsocks-service/src/local/redir/sys/unix/bsd_pf.rs b/crates/shadowsocks-service/src/local/redir/sys/unix/bsd_pf.rs
index 63565c9e..f4c3fbbc 100644
--- a/crates/shadowsocks-service/src/local/redir/sys/unix/bsd_pf.rs
+++ b/crates/shadowsocks-service/src/local/redir/sys/unix/bsd_pf.rs
@@ -2,24 +2,23 @@
 
 use std::{
     io::{self, Error, ErrorKind},
+    mem,
     net::SocketAddr,
+    ptr,
 };
 
 use cfg_if::cfg_if;
+use log::trace;
 use nix::ioctl_readwrite;
 use once_cell::sync::Lazy;
-
-use super::pfvar::{pfioc_natlook, pfioc_states};
-use log::trace;
-
-use super::pfvar::{in6_addr, in_addr, sockaddr_in, sockaddr_in6, PF_OUT};
 use socket2::{Protocol, SockAddr};
-use std::{mem, ptr};
 
+use super::pfvar::{in6_addr, in_addr, pfioc_natlook, pfioc_states, sockaddr_in, sockaddr_in6, PF_OUT};
 #[cfg(any(target_os = "macos", target_os = "ios"))]
 use super::pfvar::{pf_addr, pfsync_state};
 
 ioctl_readwrite!(ioc_natlook, 'D', 23, pfioc_natlook);
+#[cfg(any(target_os = "macos", target_os = "ios"))]
 ioctl_readwrite!(ioc_getstates, 'D', 25, pfioc_states);
 
 pub struct PacketFilter {
diff --git a/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/bsd.rs b/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/bsd.rs
index bba61400..acc9bb65 100644
--- a/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/bsd.rs
+++ b/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/bsd.rs
@@ -269,7 +269,7 @@ fn set_disable_ip_fragmentation(level: libc::c_int, socket: &Socket) -> io::Resu
     const IPV6_DONTFRAG: libc::c_int = 62; // bool; disable IPv6 fragmentation
 
     let enable: libc::c_int = 1;
-    
+
     let opt = match level {
         libc::IPPROTO_IP => IP_DONTFRAG,
         libc::IPPROTO_IPV6 => IPV6_DONTFRAG,
@@ -325,9 +325,9 @@ fn get_destination_addr(msg: &libc::msghdr) -> io::Result<SocketAddr> {
                 match (rcmsg.cmsg_level, rcmsg.cmsg_type) {
                     (libc::IPPROTO_IP, libc::IP_ORIGDSTADDR) => {
                         ptr::copy_nonoverlapping(
-                            libc::CMSG_DATA(cmsg), 
-                            dst_addr as *mut _, 
-                            mem::size_of::<libc::sockaddr_in>()
+                            libc::CMSG_DATA(cmsg),
+                            dst_addr as *mut _,
+                            mem::size_of::<libc::sockaddr_in>(),
                         );
                         *dst_addr_len = mem::size_of::<libc::sockaddr_in>() as libc::socklen_t;
 
@@ -382,11 +382,7 @@ fn recv_dest_from(socket: &UdpSocket, buf: &mut [u8]) -> io::Result<(usize, Sock
         }
 
         let (_, src_saddr) = SockAddr::try_init(|a, l| {
-            ptr::copy_nonoverlapping(
-                msg.msg_name, 
-                a as *mut _, 
-                msg.msg_namelen as usize
-            );
+            ptr::copy_nonoverlapping(msg.msg_name, a as *mut _, msg.msg_namelen as usize);
             *l = msg.msg_namelen;
             Ok(())
         })?;
diff --git a/src/service/local.rs b/src/service/local.rs
index b0049395..66232336 100644
--- a/src/service/local.rs
+++ b/src/service/local.rs
@@ -25,7 +25,12 @@ use shadowsocks_service::shadowsocks::relay::socks5::Address;
 use shadowsocks_service::{
     acl::AccessControl,
     config::{
-        read_variable_field_value, Config, ConfigType, LocalConfig, LocalInstanceConfig, ProtocolType,
+        read_variable_field_value,
+        Config,
+        ConfigType,
+        LocalConfig,
+        LocalInstanceConfig,
+        ProtocolType,
         ServerInstanceConfig,
     },
     local::{loadbalancing::PingBalancer, Server},
@@ -40,7 +45,8 @@ use shadowsocks_service::{
 use crate::logging;
 use crate::{
     config::{Config as ServiceConfig, RuntimeMode},
-    monitor, vparser,
+    monitor,
+    vparser,
 };
 
 #[cfg(feature = "local-dns")]