Mirrors/rustdesk-server
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk-server.git synced 2026-03-09 21:43:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

clippy

Browse Source
This commit is contained in:
rustdesk
2023-02-08 16:45:30 +08:00
parent 7e307a5a1c
commit e2f4962ba8
9 changed files with 93 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libs/hbb_common/src/socket_client.rs
View File

@@ -13,22 +13,22 @@ use tokio_socks::{IntoTargetAddr, TargetAddr};
pub fn check_port<T: std::string::ToString>(host: T, port: i32) -> String {
let host = host.to_string();
if crate::is_ipv6_str(&host) {
if host.starts_with("[") {
if host.starts_with('[') {
return host;
}
return format!("[{}]:{}", host, port);
return format!("[{host}]:{port}");
}
if !host.contains(":") {
return format!("{}:{}", host, port);
if !host.contains(':') {
return format!("{host}:{port}");
}
return host;
host
}
#[inline]
pub fn increase_port<T: std::string::ToString>(host: T, offset: i32) -> String {
let host = host.to_string();
if crate::is_ipv6_str(&host) {
if host.starts_with("[") {
if host.starts_with('[') {
let tmp: Vec<&str> = host.split("]:").collect();
if tmp.len() == 2 {
let port: i32 = tmp[1].parse().unwrap_or(0);
@@ -37,8 +37,8 @@ pub fn increase_port<T: std::string::ToString>(host: T, offset: i32) -> String {
}
}
}
} else if host.contains(":") {
let tmp: Vec<&str> = host.split(":").collect();
} else if host.contains(':') {
let tmp: Vec<&str> = host.split(':').collect();
if tmp.len() == 2 {
let port: i32 = tmp[1].parse().unwrap_or(0);
if port > 0 {
@@ -46,7 +46,7 @@ pub fn increase_port<T: std::string::ToString>(host: T, offset: i32) -> String {
}
}
}
return host;
host
}
pub fn test_if_valid_server(host: &str) -> String {
@@ -148,7 +148,7 @@ pub async fn query_nip_io(addr: &SocketAddr) -> ResultType<SocketAddr> {
pub fn ipv4_to_ipv6(addr: String, ipv4: bool) -> String {
if !ipv4 && crate::is_ipv4_str(&addr) {
if let Some(ip) = addr.split(':').next() {
return addr.replace(ip, &format!("{}.nip.io", ip));
return addr.replace(ip, &format!("{ip}.nip.io"));
}
}
addr
@@ -163,7 +163,7 @@ async fn test_target(target: &str) -> ResultType<SocketAddr> {
tokio::net::lookup_host(target)
.await?
.next()
.context(format!("Failed to look up host for {}", target))
.context(format!("Failed to look up host for {target}"))
}
#[inline]