Skip to content

Commit da6e35b

Browse files
authored
refactor(client): small refactoring (#88)
* refactor(client): remove reference to reference * refactor(client): remove unnecessary clone * refactor(client): use some api instead of manual implementaion
1 parent 784109d commit da6e35b

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

src/client/legacy/client.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ where
633633
impl<C: Clone, B> Clone for Client<C, B> {
634634
fn clone(&self) -> Client<C, B> {
635635
Client {
636-
config: self.config.clone(),
636+
config: self.config,
637637
exec: self.exec.clone(),
638638
#[cfg(feature = "http1")]
639639
h1_builder: self.h1_builder.clone(),
@@ -925,7 +925,7 @@ fn set_scheme(uri: &mut Uri, scheme: Scheme) {
925925
uri.scheme().is_none(),
926926
"set_scheme expects no existing scheme"
927927
);
928-
let old = std::mem::replace(uri, Uri::default());
928+
let old = std::mem::take(uri);
929929
let mut parts: ::http::uri::Parts = old.into();
930930
parts.scheme = Some(scheme);
931931
parts.path_and_query = Some("/".parse().expect("slash is a valid path"));

src/client/legacy/connect/http.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -606,9 +606,7 @@ struct ConnectingTcpRemote {
606606

607607
impl ConnectingTcpRemote {
608608
fn new(addrs: dns::SocketAddrs, connect_timeout: Option<Duration>) -> Self {
609-
let connect_timeout = connect_timeout
610-
.map(|t| t.checked_div(addrs.len() as u32))
611-
.flatten();
609+
let connect_timeout = connect_timeout.and_then(|t| t.checked_div(addrs.len() as u32));
612610

613611
Self {
614612
addrs,

src/client/legacy/pool.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ impl<T: Poolable, K: Key> PoolInner<T, K> {
388388
Some(value) => {
389389
// borrow-check scope...
390390
{
391-
let idle_list = self.idle.entry(key.clone()).or_insert_with(Vec::new);
391+
let idle_list = self.idle.entry(key.clone()).or_default();
392392
if self.max_idle_per_host <= idle_list.len() {
393393
trace!("max idle per host for {:?}, dropping connection", key);
394394
return;

src/server/conn/auto.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,7 @@ pub struct Http1Builder<'a, E> {
411411
impl<E> Http1Builder<'_, E> {
412412
/// Http2 configuration.
413413
pub fn http2(&mut self) -> Http2Builder<'_, E> {
414-
Http2Builder {
415-
inner: &mut self.inner,
416-
}
414+
Http2Builder { inner: self.inner }
417415
}
418416

419417
/// Set whether HTTP/1 connections should support half-closures.
@@ -546,9 +544,7 @@ pub struct Http2Builder<'a, E> {
546544
impl<E> Http2Builder<'_, E> {
547545
/// Http1 configuration.
548546
pub fn http1(&mut self) -> Http1Builder<'_, E> {
549-
Http1Builder {
550-
inner: &mut self.inner,
551-
}
547+
Http1Builder { inner: self.inner }
552548
}
553549

554550
/// Sets the [`SETTINGS_INITIAL_WINDOW_SIZE`][spec] option for HTTP2

0 commit comments

Comments
 (0)