diff --git a/clippy.toml b/clippy.toml index f234c901..b339f7c3 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1 +1 @@ -msrv = "1.83" +msrv = "1.85" diff --git a/crates/shadowsocks-service/src/local/fake_dns/manager.rs b/crates/shadowsocks-service/src/local/fake_dns/manager.rs index 90d56c18..7bad1367 100644 --- a/crates/shadowsocks-service/src/local/fake_dns/manager.rs +++ b/crates/shadowsocks-service/src/local/fake_dns/manager.rs @@ -297,7 +297,7 @@ impl FakeDnsManager { // Ok. It is not expired yet. Try to extend its expire time. ip_mapping.expire_time = now + self.expire_duration.as_secs() as i64; let nv = ip_mapping.encode_to_vec()?; - let _ = db.put(&ip2name_key, nv)?; + db.put(&ip2name_key, nv)?; // Update name2ip's expire time @@ -313,7 +313,7 @@ impl FakeDnsManager { let mut domain_name_mapping = proto::DomainNameMapping::decode(&v)?; domain_name_mapping.expire_time = ip_mapping.expire_time; let nv = domain_name_mapping.encode_to_vec()?; - let _ = db.put(&name2ip_key, nv)?; + db.put(&name2ip_key, nv)?; } None => { // Interesting. No name2ip. diff --git a/crates/shadowsocks-service/src/local/net/udp/association.rs b/crates/shadowsocks-service/src/local/net/udp/association.rs index ffc45a55..9229ba2d 100644 --- a/crates/shadowsocks-service/src/local/net/udp/association.rs +++ b/crates/shadowsocks-service/src/local/net/udp/association.rs @@ -447,19 +447,14 @@ where err ); } - } else { - match self.dispatch_received_proxied_packet(target_addr, data).await { - Err(err) => { - error!( - "udp relay {} -> {} (proxied) with {} bytes, error: {}", - self.peer_addr, - target_addr, - data.len(), - err - ); - } - _ => {} - } + } else if let Err(err) = self.dispatch_received_proxied_packet(target_addr, data).await { + error!( + "udp relay {} -> {} (proxied) with {} bytes, error: {}", + self.peer_addr, + target_addr, + data.len(), + err + ); } }