Skip to content

Commit 0d44694

Browse files
committed
cargo fmt
1 parent 857da6d commit 0d44694

File tree

4 files changed

+14
-21
lines changed

4 files changed

+14
-21
lines changed

crates/shadowsocks-service/src/local/socks/server/socks5/tcprelay.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,7 @@ impl Socks5TcpHandler {
173173

174174
Err(Error::new(
175175
ErrorKind::Other,
176-
format!(
177-
"Username/Password Authentication failed, user: {user_name}, password: {password}"
178-
),
176+
format!("Username/Password Authentication failed, user: {user_name}, password: {password}"),
179177
))
180178
}
181179
}

crates/shadowsocks/src/dns_resolver/resolver.rs

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -345,10 +345,7 @@ impl DnsResolver {
345345
DnsResolver::System => match lookup_host((addr, port)).await {
346346
Ok(v) => Ok(EitherResolved::Tokio(v)),
347347
Err(err) => {
348-
let err = Error::new(
349-
ErrorKind::Other,
350-
format!("dns resolve {addr}:{port} error: {err}"),
351-
);
348+
let err = Error::new(ErrorKind::Other, format!("dns resolve {addr}:{port} error: {err}"));
352349
Err(err)
353350
}
354351
},
@@ -358,10 +355,7 @@ impl DnsResolver {
358355
lookup_result.into_iter().map(move |ip| SocketAddr::new(ip, port)),
359356
)),
360357
Err(err) => {
361-
let err = Error::new(
362-
ErrorKind::Other,
363-
format!("dns resolve {addr}:{port} error: {err}"),
364-
);
358+
let err = Error::new(ErrorKind::Other, format!("dns resolve {addr}:{port} error: {err}"));
365359
Err(err)
366360
}
367361
},
@@ -371,20 +365,14 @@ impl DnsResolver {
371365
lookup_result.into_iter().map(move |ip| SocketAddr::new(ip, port)),
372366
)),
373367
Err(err) => {
374-
let err = Error::new(
375-
ErrorKind::Other,
376-
format!("dns resolve {addr}:{port} error: {err}"),
377-
);
368+
let err = Error::new(ErrorKind::Other, format!("dns resolve {addr}:{port} error: {err}"));
378369
Err(err)
379370
}
380371
},
381372
DnsResolver::Custom(ref resolver) => match resolver.resolve(addr, port).await {
382373
Ok(v) => Ok(EitherResolved::Custom(v.into_iter())),
383374
Err(err) => {
384-
let err = Error::new(
385-
ErrorKind::Other,
386-
format!("dns resolve {addr}:{port} error: {err}"),
387-
);
375+
let err = Error::new(ErrorKind::Other, format!("dns resolve {addr}:{port} error: {err}"));
388376
Err(err)
389377
}
390378
},

crates/shadowsocks/src/relay/socks5.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ use bytes::{Buf, BufMut, BytesMut};
1616
use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
1717

1818
pub use self::consts::{
19-
SOCKS5_AUTH_METHOD_GSSAPI, SOCKS5_AUTH_METHOD_NONE, SOCKS5_AUTH_METHOD_NOT_ACCEPTABLE, SOCKS5_AUTH_METHOD_PASSWORD,
19+
SOCKS5_AUTH_METHOD_GSSAPI,
20+
SOCKS5_AUTH_METHOD_NONE,
21+
SOCKS5_AUTH_METHOD_NOT_ACCEPTABLE,
22+
SOCKS5_AUTH_METHOD_PASSWORD,
2023
};
2124

2225
#[rustfmt::skip]

crates/shadowsocks/src/relay/udprelay/proxy_socket.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ use crate::{
2323
};
2424

2525
use super::crypto_io::{
26-
decrypt_client_payload, decrypt_server_payload, encrypt_client_payload, encrypt_server_payload, ProtocolError,
26+
decrypt_client_payload,
27+
decrypt_server_payload,
28+
encrypt_client_payload,
29+
encrypt_server_payload,
30+
ProtocolError,
2731
ProtocolResult,
2832
};
2933

0 commit comments

Comments
 (0)