From 02b9ad74ca930be7ed71b5f8f4cd6db59102a4ce Mon Sep 17 00:00:00 2001 From: zonyitoo Date: Sat, 27 Nov 2021 16:46:27 +0800 Subject: [PATCH] make clippy happy --- crates/shadowsocks-service/src/local/mod.rs | 6 ++++-- crates/shadowsocks-service/src/manager/mod.rs | 6 ++++-- crates/shadowsocks-service/src/server/mod.rs | 6 ++++-- src/service/local.rs | 2 +- src/service/manager.rs | 2 +- src/service/server.rs | 2 +- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/crates/shadowsocks-service/src/local/mod.rs b/crates/shadowsocks-service/src/local/mod.rs index 946a14a7..392d5ee4 100644 --- a/crates/shadowsocks-service/src/local/mod.rs +++ b/crates/shadowsocks-service/src/local/mod.rs @@ -116,8 +116,10 @@ pub async fn create(config: Config) -> io::Result { connect_opts.tcp.keepalive = config.keep_alive.or(Some(LOCAL_DEFAULT_KEEPALIVE_TIMEOUT)); context.set_connect_opts(connect_opts); - let mut accept_opts = AcceptOpts::default(); - accept_opts.ipv6_only = config.ipv6_only; + let mut accept_opts = AcceptOpts { + ipv6_only: config.ipv6_only, + ..Default::default() + }; accept_opts.tcp.send_buffer_size = config.inbound_send_buffer_size; accept_opts.tcp.recv_buffer_size = config.inbound_recv_buffer_size; accept_opts.tcp.nodelay = config.no_delay; diff --git a/crates/shadowsocks-service/src/manager/mod.rs b/crates/shadowsocks-service/src/manager/mod.rs index 281b393b..4d417787 100644 --- a/crates/shadowsocks-service/src/manager/mod.rs +++ b/crates/shadowsocks-service/src/manager/mod.rs @@ -52,8 +52,10 @@ pub async fn run(config: Config) -> io::Result<()> { connect_opts.tcp.fastopen = config.fast_open; connect_opts.tcp.keepalive = config.keep_alive.or(Some(SERVER_DEFAULT_KEEPALIVE_TIMEOUT)); - let mut accept_opts = AcceptOpts::default(); - accept_opts.ipv6_only = config.ipv6_only; + let mut accept_opts = AcceptOpts { + ipv6_only: config.ipv6_only, + ..Default::default() + }; accept_opts.tcp.send_buffer_size = config.inbound_send_buffer_size; accept_opts.tcp.recv_buffer_size = config.inbound_recv_buffer_size; accept_opts.tcp.nodelay = config.no_delay; diff --git a/crates/shadowsocks-service/src/server/mod.rs b/crates/shadowsocks-service/src/server/mod.rs index 8dd7bad4..abebfd00 100644 --- a/crates/shadowsocks-service/src/server/mod.rs +++ b/crates/shadowsocks-service/src/server/mod.rs @@ -69,8 +69,10 @@ pub async fn run(config: Config) -> io::Result<()> { connect_opts.tcp.fastopen = config.fast_open; connect_opts.tcp.keepalive = config.keep_alive.or(Some(SERVER_DEFAULT_KEEPALIVE_TIMEOUT)); - let mut accept_opts = AcceptOpts::default(); - accept_opts.ipv6_only = config.ipv6_only; + let mut accept_opts = AcceptOpts { + ipv6_only: config.ipv6_only, + ..Default::default() + }; accept_opts.tcp.send_buffer_size = config.inbound_send_buffer_size; accept_opts.tcp.recv_buffer_size = config.inbound_recv_buffer_size; accept_opts.tcp.nodelay = config.no_delay; diff --git a/src/service/local.rs b/src/service/local.rs index 9c5d7e81..7e57b522 100644 --- a/src/service/local.rs +++ b/src/service/local.rs @@ -195,7 +195,7 @@ pub fn main(matches: &ArgMatches<'_>) { logging::init_with_file(path); } None => { - logging::init_with_config("sslocal", &matches); + logging::init_with_config("sslocal", matches); } } diff --git a/src/service/manager.rs b/src/service/manager.rs index 5074b4ab..ce6171f0 100644 --- a/src/service/manager.rs +++ b/src/service/manager.rs @@ -121,7 +121,7 @@ pub fn main(matches: &ArgMatches<'_>) { logging::init_with_file(path); } None => { - logging::init_with_config("ssmanager", &matches); + logging::init_with_config("ssmanager", matches); } } diff --git a/src/service/server.rs b/src/service/server.rs index 634006a5..df42b8af 100644 --- a/src/service/server.rs +++ b/src/service/server.rs @@ -122,7 +122,7 @@ pub fn main(matches: &ArgMatches<'_>) { logging::init_with_file(path); } None => { - logging::init_with_config("ssserver", &matches); + logging::init_with_config("ssserver", matches); } }