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, 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, 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 ShadowsocksResult<(Runtime, impl Future ShadowsocksResult<(Runtime, impl Future