Skip to content

Commit d83d6d2

Browse files
authored
chore: clippy fix (#2059)
1 parent 8133713 commit d83d6d2

File tree

4 files changed

+26
-34
lines changed

4 files changed

+26
-34
lines changed

crates/shadowsocks-service/src/local/redir/sys/mod.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ where
1818
S: std::os::unix::io::AsFd,
1919
{
2020
let sock = SockRef::from(socket);
21-
let result = sock.set_only_v6(ipv6_only);
22-
result
21+
sock.set_only_v6(ipv6_only)
2322
}
2423

2524
#[cfg(windows)]
@@ -29,6 +28,5 @@ where
2928
S: std::os::windows::io::AsSocket,
3029
{
3130
let sock = SockRef::from(socket);
32-
let result = sock.set_only_v6(ipv6_only);
33-
result
31+
sock.set_only_v6(ipv6_only)
3432
}

crates/shadowsocks/src/net/sys/mod.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ where
7474
S: std::os::unix::io::AsFd,
7575
{
7676
let sock = SockRef::from(socket);
77-
let result = socket_bind_dual_stack_inner(&sock, addr, ipv6_only);
78-
79-
result
77+
socket_bind_dual_stack_inner(&sock, addr, ipv6_only)
8078
}
8179

8280
/// Try to call `bind()` with dual-stack enabled.
@@ -88,9 +86,7 @@ where
8886
S: std::os::windows::io::AsSocket,
8987
{
9088
let sock = SockRef::from(socket);
91-
let result = socket_bind_dual_stack_inner(&sock, addr, ipv6_only);
92-
93-
result
89+
socket_bind_dual_stack_inner(&sock, addr, ipv6_only)
9490
}
9591

9692
fn socket_bind_dual_stack_inner(socket: &Socket, addr: &SocketAddr, ipv6_only: bool) -> io::Result<()> {

crates/shadowsocks/src/net/sys/unix/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ where
101101
F: FnOnce(&Socket) -> io::Result<()>,
102102
{
103103
let socket = SockRef::from(stream);
104-
let result = f(&socket);
105-
result
104+
f(&socket)
106105
}
107106

108107
pub fn set_common_sockopt_after_connect<S>(stream: &S, opts: &ConnectOpts) -> io::Result<()>

crates/shadowsocks/src/net/sys/windows/mod.rs

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ pub fn set_tcp_fastopen<S: AsRawSocket>(socket: &S) -> io::Result<()> {
165165
unsafe {
166166
let ret = setsockopt(
167167
socket.as_raw_socket() as SOCKET,
168-
IPPROTO_TCP as i32,
169-
TCP_FASTOPEN as i32,
168+
IPPROTO_TCP,
169+
TCP_FASTOPEN,
170170
&enable as *const _ as PCSTR,
171171
mem::size_of_val(&enable) as i32,
172172
);
@@ -233,12 +233,12 @@ fn find_adapter_interface_index(addr: &SocketAddr, iface: &str) -> io::Result<Op
233233
let friendly_name_len: usize = libc::wcslen(ip_adapter_address.FriendlyName);
234234
let friendly_name_slice: &[u16] = slice::from_raw_parts(ip_adapter_address.FriendlyName, friendly_name_len);
235235
let friendly_name_os = OsString::from_wide(friendly_name_slice); // UTF-16 to UTF-8
236-
if let Some(friendly_name) = friendly_name_os.to_str() {
237-
if friendly_name == iface {
238-
match ip {
239-
IpAddr::V4(..) => return Ok(Some(ip_adapter_address.Anonymous1.Anonymous.IfIndex)),
240-
IpAddr::V6(..) => return Ok(Some(ip_adapter_address.Ipv6IfIndex)),
241-
}
236+
if let Some(friendly_name) = friendly_name_os.to_str()
237+
&& friendly_name == iface
238+
{
239+
match ip {
240+
IpAddr::V4(..) => return Ok(Some(ip_adapter_address.Anonymous1.Anonymous.IfIndex)),
241+
IpAddr::V6(..) => return Ok(Some(ip_adapter_address.Ipv6IfIndex)),
242242
}
243243
}
244244

@@ -314,8 +314,8 @@ fn set_ip_unicast_if<S: AsRawSocket>(socket: &S, addr: &SocketAddr, iface: &str)
314314
let if_index = htonl(if_index);
315315
setsockopt(
316316
handle,
317-
IPPROTO_IP as i32,
318-
IP_UNICAST_IF as i32,
317+
IPPROTO_IP,
318+
IP_UNICAST_IF,
319319
&if_index as *const _ as PCSTR,
320320
mem::size_of_val(&if_index) as i32,
321321
)
@@ -324,8 +324,8 @@ fn set_ip_unicast_if<S: AsRawSocket>(socket: &S, addr: &SocketAddr, iface: &str)
324324
// Interface index is in host byte order for IPPROTO_IPV6.
325325
setsockopt(
326326
handle,
327-
IPPROTO_IPV6 as i32,
328-
IPV6_UNICAST_IF as i32,
327+
IPPROTO_IPV6,
328+
IPV6_UNICAST_IF,
329329
&if_index as *const _ as PCSTR,
330330
mem::size_of_val(&if_index) as i32,
331331
)
@@ -397,8 +397,8 @@ pub fn set_disable_ip_fragmentation<S: AsRawSocket>(af: AddrFamily, socket: &S)
397397
let value = IP_PMTUDISC_DO;
398398
let ret = setsockopt(
399399
handle,
400-
IPPROTO_IP as i32,
401-
IP_MTU_DISCOVER as i32,
400+
IPPROTO_IP,
401+
IP_MTU_DISCOVER,
402402
&value as *const _ as PCSTR,
403403
mem::size_of_val(&value) as i32,
404404
);
@@ -412,8 +412,8 @@ pub fn set_disable_ip_fragmentation<S: AsRawSocket>(af: AddrFamily, socket: &S)
412412
let value = IP_PMTUDISC_DO;
413413
let ret = setsockopt(
414414
handle,
415-
IPPROTO_IPV6 as i32,
416-
IPV6_MTU_DISCOVER as i32,
415+
IPPROTO_IPV6,
416+
IPV6_MTU_DISCOVER,
417417
&value as *const _ as PCSTR,
418418
mem::size_of_val(&value) as i32,
419419
);
@@ -502,10 +502,10 @@ pub async fn bind_outbound_udp_socket(bind_addr: &SocketAddr, opts: &ConnectOpts
502502
socket.set_nonblocking(true)?;
503503
let socket = UdpSocket::from_std(socket.into())?;
504504

505-
if !opts.udp.allow_fragmentation {
506-
if let Err(err) = set_disable_ip_fragmentation(af, &socket) {
507-
warn!("failed to disable IP fragmentation, error: {}", err);
508-
}
505+
if !opts.udp.allow_fragmentation
506+
&& let Err(err) = set_disable_ip_fragmentation(af, &socket)
507+
{
508+
warn!("failed to disable IP fragmentation, error: {}", err);
509509
}
510510
disable_connection_reset(&socket)?;
511511

@@ -519,8 +519,7 @@ where
519519
F: FnOnce(&Socket) -> io::Result<()>,
520520
{
521521
let socket = SockRef::from(stream);
522-
let result = f(&socket);
523-
result
522+
f(&socket)
524523
}
525524

526525
pub fn set_common_sockopt_after_connect<S>(stream: &S, opts: &ConnectOpts) -> io::Result<()>

0 commit comments

Comments
 (0)