From c86f5b28407d222381bd98f4c8eb332a25611eb9 Mon Sep 17 00:00:00 2001 From: tottoto Date: Sun, 14 Jan 2024 14:07:37 +0900 Subject: [PATCH] refactor(client): use some api instead of manual implementaion --- src/client/legacy/client.rs | 2 +- src/client/legacy/connect/http.rs | 4 +--- src/client/legacy/pool.rs | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/client/legacy/client.rs b/src/client/legacy/client.rs index 1cdaa20..7c83923 100644 --- a/src/client/legacy/client.rs +++ b/src/client/legacy/client.rs @@ -924,7 +924,7 @@ fn set_scheme(uri: &mut Uri, scheme: Scheme) { uri.scheme().is_none(), "set_scheme expects no existing scheme" ); - let old = std::mem::replace(uri, Uri::default()); + let old = std::mem::take(uri); let mut parts: ::http::uri::Parts = old.into(); parts.scheme = Some(scheme); parts.path_and_query = Some("/".parse().expect("slash is a valid path")); diff --git a/src/client/legacy/connect/http.rs b/src/client/legacy/connect/http.rs index b08b6d7..48b391c 100644 --- a/src/client/legacy/connect/http.rs +++ b/src/client/legacy/connect/http.rs @@ -606,9 +606,7 @@ struct ConnectingTcpRemote { impl ConnectingTcpRemote { fn new(addrs: dns::SocketAddrs, connect_timeout: Option) -> Self { - let connect_timeout = connect_timeout - .map(|t| t.checked_div(addrs.len() as u32)) - .flatten(); + let connect_timeout = connect_timeout.and_then(|t| t.checked_div(addrs.len() as u32)); Self { addrs, diff --git a/src/client/legacy/pool.rs b/src/client/legacy/pool.rs index 77f02d1..e56488a 100644 --- a/src/client/legacy/pool.rs +++ b/src/client/legacy/pool.rs @@ -381,7 +381,7 @@ impl PoolInner { Some(value) => { // borrow-check scope... { - let idle_list = self.idle.entry(key.clone()).or_insert_with(Vec::new); + let idle_list = self.idle.entry(key.clone()).or_default(); if self.max_idle_per_host <= idle_list.len() { trace!("max idle per host for {:?}, dropping connection", key); return;