From 3c1f4bf07060c1dbe73a3706a4a6464106484f2d Mon Sep 17 00:00:00 2001
From: Aaron Chen <aaronchen.lisp@gmail.com>
Date: Sat, 11 Jan 2025 12:39:52 +0800
Subject: [PATCH] chore: clippy fix

---
 .github/workflows/build-and-test.yml                       | 2 +-
 clippy.toml                                                | 2 +-
 crates/shadowsocks-service/src/local/redir/tcprelay/mod.rs | 2 +-
 crates/shadowsocks-service/src/local/tun/tcp.rs            | 4 ++--
 src/service/local.rs                                       | 6 ++----
 src/service/manager.rs                                     | 6 ++----
 src/service/server.rs                                      | 6 ++----
 7 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 37c7de00c826..510dc25910a4 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -11,7 +11,7 @@ env:
   RUST_LOG: "trace"
 
 jobs:
-  buid-test-check:
+  build-test-check:
     strategy:
       matrix:
         platform:
diff --git a/clippy.toml b/clippy.toml
index 866add684a96..65f527ae426f 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -1 +1 @@
-msrv = "1.74"
+msrv = "1.77"
diff --git a/crates/shadowsocks-service/src/local/redir/tcprelay/mod.rs b/crates/shadowsocks-service/src/local/redir/tcprelay/mod.rs
index 3b76a62b6a57..066ffe715f76 100644
--- a/crates/shadowsocks-service/src/local/redir/tcprelay/mod.rs
+++ b/crates/shadowsocks-service/src/local/redir/tcprelay/mod.rs
@@ -32,7 +32,7 @@ mod sys;
 /// Established Client Transparent Proxy
 ///
 /// This method must be called after handshaking with client (for example, socks5 handshaking)
-async fn establish_client_tcp_redir<'a>(
+async fn establish_client_tcp_redir(
     context: Arc<ServiceContext>,
     balancer: PingBalancer,
     mut stream: TcpStream,
diff --git a/crates/shadowsocks-service/src/local/tun/tcp.rs b/crates/shadowsocks-service/src/local/tun/tcp.rs
index 4042a3d2184d..441de6d01a3c 100644
--- a/crates/shadowsocks-service/src/local/tun/tcp.rs
+++ b/crates/shadowsocks-service/src/local/tun/tcp.rs
@@ -546,7 +546,7 @@ impl TcpTun {
 
     pub async fn drive_interface_state(&mut self, frame: &[u8]) {
         if self.iface_tx.send(frame.to_vec()).is_err() {
-            panic!("interface send channel closed unexpectly");
+            panic!("interface send channel closed unexpectedly");
         }
 
         // Wake up and poll the interface.
@@ -565,7 +565,7 @@ impl TcpTun {
 /// Established Client Transparent Proxy
 ///
 /// This method must be called after handshaking with client (for example, socks5 handshaking)
-async fn establish_client_tcp_redir<'a>(
+async fn establish_client_tcp_redir(
     context: Arc<ServiceContext>,
     balancer: PingBalancer,
     mut stream: TcpConnection,
diff --git a/src/service/local.rs b/src/service/local.rs
index 85d7fe3996a8..93fe084f5052 100644
--- a/src/service/local.rs
+++ b/src/service/local.rs
@@ -939,10 +939,8 @@ pub fn create(matches: &ArgMatches) -> ShadowsocksResult<(Runtime, impl Future<O
         // DONE READING options
 
         if config.local.is_empty() {
-            return Err(ShadowsocksError::InsufficientParams(format!(
-                "missing `local_address`, consider specifying it by --local-addr command line option, \
-                    or \"local_address\" and \"local_port\" in configuration file"
-            )));
+            return Err(ShadowsocksError::InsufficientParams("missing `local_address`, consider specifying it by --local-addr command line option, \
+                    or \"local_address\" and \"local_port\" in configuration file".to_string()));
         }
 
         config
diff --git a/src/service/manager.rs b/src/service/manager.rs
index 0bb2b55fd3fa..980fcce8c573 100644
--- a/src/service/manager.rs
+++ b/src/service/manager.rs
@@ -457,10 +457,8 @@ pub fn create(matches: &ArgMatches) -> ShadowsocksResult<(Runtime, impl Future<O
         // DONE reading options
 
         config.manager.as_ref().ok_or_else(|| {
-            ShadowsocksError::InsufficientParams(format!(
-                "missing `manager_address`, consider specifying it by --manager-address command line option, \
-                    or \"manager_address\" and \"manager_port\" keys in configuration file"
-            ))
+            ShadowsocksError::InsufficientParams("missing `manager_address`, consider specifying it by --manager-address command line option, \
+                    or \"manager_address\" and \"manager_port\" keys in configuration file".to_string())
         })?;
 
         config
diff --git a/src/service/server.rs b/src/service/server.rs
index a905bec767b9..260178bd6f04 100644
--- a/src/service/server.rs
+++ b/src/service/server.rs
@@ -481,11 +481,9 @@ pub fn create(matches: &ArgMatches) -> ShadowsocksResult<(Runtime, impl Future<O
         // DONE READING options
 
         if config.server.is_empty() {
-            return Err(ShadowsocksError::InsufficientParams(format!(
-                "missing proxy servers, consider specifying it by \
+            return Err(ShadowsocksError::InsufficientParams("missing proxy servers, consider specifying it by \
                     --server-addr, --encrypt-method, --password command line option, \
-                        or configuration file, check more details in https://shadowsocks.org/doc/configs.html"
-            )));
+                        or configuration file, check more details in https://shadowsocks.org/doc/configs.html".to_string()));
         }
 
         config