Skip to content

Commit f23e23d

Browse files
madeyeclaude
andcommitted
Fix cargo fmt formatting to pass CI
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 9bed8e8 commit f23e23d

File tree

2 files changed

+40
-17
lines changed

2 files changed

+40
-17
lines changed

src/proxy.rs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@ use crate::ProxyBody;
2121
const TUNNEL_BUF_SIZE: usize = 128 * 1024;
2222

2323
/// Global pooled HTTP/1.1 client for forward proxying (non-TFO path).
24-
static POOLED_CLIENT: std::sync::OnceLock<Client<hyper_util::client::legacy::connect::HttpConnector, Incoming>> = std::sync::OnceLock::new();
24+
static POOLED_CLIENT: std::sync::OnceLock<
25+
Client<hyper_util::client::legacy::connect::HttpConnector, Incoming>,
26+
> = std::sync::OnceLock::new();
2527

26-
fn get_pooled_client() -> &'static Client<hyper_util::client::legacy::connect::HttpConnector, Incoming> {
28+
fn get_pooled_client(
29+
) -> &'static Client<hyper_util::client::legacy::connect::HttpConnector, Incoming> {
2730
POOLED_CLIENT.get_or_init(|| {
2831
Client::builder(TokioExecutor::new())
2932
.pool_idle_timeout(std::time::Duration::from_secs(90))
@@ -66,8 +69,13 @@ pub async fn handle_connect(
6669
let mut client = TokioIo::new(upgraded);
6770
match net::connect(&addr, fast_open).await {
6871
Ok(mut target) => {
69-
if let Err(e) =
70-
tokio::io::copy_bidirectional_with_sizes(&mut client, &mut target, TUNNEL_BUF_SIZE, TUNNEL_BUF_SIZE).await
72+
if let Err(e) = tokio::io::copy_bidirectional_with_sizes(
73+
&mut client,
74+
&mut target,
75+
TUNNEL_BUF_SIZE,
76+
TUNNEL_BUF_SIZE,
77+
)
78+
.await
7179
{
7280
error!("tunnel {addr} io error: {e}");
7381
}
@@ -161,10 +169,7 @@ pub async fn handle_forward(
161169
} else {
162170
// Pooled client path: connection reuse, automatic URI handling
163171
let client = get_pooled_client();
164-
let resp = client
165-
.request(req)
166-
.await
167-
.context("pooled client request")?;
172+
let resp = client.request(req).await.context("pooled client request")?;
168173

169174
let (parts, body) = resp.into_parts();
170175
Ok(Response::from_parts(parts, Either::Right(body)))

tests/throughput_tests.rs

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ async fn test_connect_tunnel_throughput() {
2020
let data = DataServer::start(CONNECT_SIZE).await;
2121
let server = TestServer::start_no_auth().await;
2222

23-
let proxy = reqwest::Proxy::all(server.proxy_url())
24-
.unwrap();
23+
let proxy = reqwest::Proxy::all(server.proxy_url()).unwrap();
2524

2625
let ca_cert = reqwest::tls::Certificate::from_pem(server.ca_pem.as_bytes()).unwrap();
2726

@@ -34,7 +33,14 @@ async fn test_connect_tunnel_throughput() {
3433
let url = format!("http://127.0.0.1:{}/data", data.addr.port());
3534

3635
// Warm up
37-
let _ = client.get(&url).send().await.unwrap().bytes().await.unwrap();
36+
let _ = client
37+
.get(&url)
38+
.send()
39+
.await
40+
.unwrap()
41+
.bytes()
42+
.await
43+
.unwrap();
3844

3945
let start = Instant::now();
4046
let resp = client.get(&url).send().await.unwrap();
@@ -61,8 +67,7 @@ async fn test_http_forward_throughput() {
6167
let data = DataServer::start(FORWARD_SIZE).await;
6268
let server = TestServer::start_no_auth().await;
6369

64-
let proxy = reqwest::Proxy::http(server.proxy_url())
65-
.unwrap();
70+
let proxy = reqwest::Proxy::http(server.proxy_url()).unwrap();
6671

6772
let ca_cert = reqwest::tls::Certificate::from_pem(server.ca_pem.as_bytes()).unwrap();
6873

@@ -75,7 +80,14 @@ async fn test_http_forward_throughput() {
7580
let url = format!("http://127.0.0.1:{}/data", data.addr.port());
7681

7782
// Warm up
78-
let _ = client.get(&url).send().await.unwrap().bytes().await.unwrap();
83+
let _ = client
84+
.get(&url)
85+
.send()
86+
.await
87+
.unwrap()
88+
.bytes()
89+
.await
90+
.unwrap();
7991

8092
let start = Instant::now();
8193
let resp = client.get(&url).send().await.unwrap();
@@ -102,8 +114,7 @@ async fn test_http_forward_request_rate() {
102114
let echo = EchoServer::start().await;
103115
let server = TestServer::start_no_auth().await;
104116

105-
let proxy = reqwest::Proxy::http(server.proxy_url())
106-
.unwrap();
117+
let proxy = reqwest::Proxy::http(server.proxy_url()).unwrap();
107118

108119
let ca_cert = reqwest::tls::Certificate::from_pem(server.ca_pem.as_bytes()).unwrap();
109120

@@ -116,7 +127,14 @@ async fn test_http_forward_request_rate() {
116127
let url = format!("http://127.0.0.1:{}/ping", echo.addr.port());
117128

118129
// Warm up
119-
let _ = client.get(&url).send().await.unwrap().bytes().await.unwrap();
130+
let _ = client
131+
.get(&url)
132+
.send()
133+
.await
134+
.unwrap()
135+
.bytes()
136+
.await
137+
.unwrap();
120138

121139
let start = Instant::now();
122140
for _ in 0..REQUEST_COUNT {

0 commit comments

Comments
 (0)