mirror of
https://github.com/shadowsocks/shadowsocks-rust.git
synced 2026-11-06 16:14:11 +00:00
remove redundant clone and Into for RemoteDnsAddress
This commit is contained in:
+4
-10
@@ -355,27 +355,21 @@ fn main() {
|
||||
|
||||
fn from_str(a: &str) -> Result<RemoteDnsAddress, Self::Err> {
|
||||
if let Ok(ip) = a.parse::<IpAddr>() {
|
||||
return Ok(Address::SocketAddress(SocketAddr::new(ip, 53)).into());
|
||||
return Ok(RemoteDnsAddress(Address::SocketAddress(SocketAddr::new(ip, 53))));
|
||||
}
|
||||
|
||||
if let Ok(saddr) = a.parse::<SocketAddr>() {
|
||||
return Ok(Address::SocketAddress(saddr).into());
|
||||
return Ok(RemoteDnsAddress(Address::SocketAddress(saddr)));
|
||||
}
|
||||
|
||||
if a.find(':').is_some() {
|
||||
a.parse::<Address>().map(Into::into)
|
||||
a.parse::<Address>().map(RemoteDnsAddress)
|
||||
} else {
|
||||
Ok(Address::DomainNameAddress(a.to_owned(), 53).into())
|
||||
Ok(RemoteDnsAddress(Address::DomainNameAddress(a.to_owned(), 53)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Into<RemoteDnsAddress> for Address {
|
||||
fn into(self) -> RemoteDnsAddress {
|
||||
RemoteDnsAddress(self)
|
||||
}
|
||||
}
|
||||
|
||||
match clap::value_t!(matches.value_of("LOCAL_DNS_ADDR"), NameServerAddr) {
|
||||
Ok(addr) => local_config.local_dns_addr = Some(addr),
|
||||
Err(ref err) if err.kind == ClapErrorKind::ArgumentNotFound => {}
|
||||
|
||||
+1
-1
@@ -170,7 +170,7 @@ fn main() {
|
||||
Err(err) => err.exit(),
|
||||
};
|
||||
|
||||
let mut sc = ServerConfig::new(svr_addr, password.to_owned(), method);
|
||||
let mut sc = ServerConfig::new(svr_addr, password, method);
|
||||
if let Some(timeout) = timeout {
|
||||
sc.set_timeout(timeout);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user