From 391a54aea1afb3e333270b8532c351d70a9c4bd4 Mon Sep 17 00:00:00 2001 From: Juan Aguilar Santillana Date: Sun, 20 Sep 2020 10:37:15 +0000 Subject: [PATCH 1/2] Avoiding get reference of a u16 --- tokio-postgres/src/connect.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tokio-postgres/src/connect.rs b/tokio-postgres/src/connect.rs index db2ddc85..2cfc9c6e 100644 --- a/tokio-postgres/src/connect.rs +++ b/tokio-postgres/src/connect.rs @@ -25,11 +25,12 @@ where let mut error = None; for (i, host) in config.host.iter().enumerate() { - let port = *config + let port = config .port .get(i) .or_else(|| config.port.get(0)) - .unwrap_or(&5432); + .copied() + .unwrap_or(5432); let hostname = match host { Host::Tcp(host) => &**host, From a2ca75e9c46ac40510572f84790d25f686755453 Mon Sep 17 00:00:00 2001 From: Juan Aguilar Santillana Date: Sun, 20 Sep 2020 10:43:22 +0000 Subject: [PATCH 2/2] Prettify `host` cast as str --- tokio-postgres/src/connect.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokio-postgres/src/connect.rs b/tokio-postgres/src/connect.rs index 2cfc9c6e..f529ddbb 100644 --- a/tokio-postgres/src/connect.rs +++ b/tokio-postgres/src/connect.rs @@ -33,7 +33,7 @@ where .unwrap_or(5432); let hostname = match host { - Host::Tcp(host) => &**host, + Host::Tcp(host) => host.as_str(), // postgres doesn't support TLS over unix sockets, so the choice here doesn't matter #[cfg(unix)] Host::Unix(_) => "",