init

chandr-andr · chandr-andr · commit e0090ec3fa26 · 2025-01-17T19:44:39.000+01:00
Signed-off-by: chandr-andr (Kiselev Aleksandr) &lt;chandr@chandr.net&gt;
diff --git a/src/driver/connection_pool.rs b/src/driver/connection_pool.rs
@@ -1,10 +1,9 @@
 use crate::runtime::tokio_runtime;
 use deadpool_postgres::{Manager, ManagerConfig, Object, Pool, RecyclingMethod};
-use futures::{stream, FutureExt, StreamExt, TryStreamExt};
-use pyo3::{pyclass, pyfunction, pymethods, Py, PyAny, Python};
-use std::{sync::Arc, time::Duration, vec};
-use tokio::time::sleep;
-use tokio_postgres::{Config, NoTls};
+use futures::{FutureExt, StreamExt, TryStreamExt};
+use pyo3::{pyclass, pyfunction, pymethods, Py, PyAny};
+use std::{sync::Arc, vec};
+use tokio_postgres::Config;
 
 use crate::{
     exceptions::rust_errors::{RustPSQLDriverError, RustPSQLDriverPyResult},
@@ -16,7 +15,7 @@ use super::{
     common_options::{ConnRecyclingMethod, LoadBalanceHosts, SslMode, TargetSessionAttrs},
     connection::Connection,
     listener::Listener,
-    utils::{build_connection_config, build_manager, build_tls, ConfiguredTLS},
+    utils::{build_connection_config, build_manager, build_tls},
 };
 
 /// Make new connection pool.
@@ -215,7 +214,7 @@ pub struct ConnectionPool {
 }
 
 impl ConnectionPool {
-    pub fn build(
+    #[must_use] pub fn build(
         pool: Pool,
         pg_config: Config,
         ca_file: Option<String>,
diff --git a/src/driver/listener.rs b/src/driver/listener.rs
@@ -1,16 +1,15 @@
 use std::{
     collections::{hash_map::Entry, HashMap},
     sync::Arc,
-    task::Poll,
 };
 
 use futures::{stream, FutureExt, StreamExt, TryStreamExt};
-use futures_channel::mpsc::{UnboundedReceiver, UnboundedSender};
+use futures_channel::mpsc::UnboundedReceiver;
 use openssl::ssl::{SslConnector, SslMethod, SslVerifyMode};
-use postgres_openssl::{MakeTlsConnector, TlsStream};
+use postgres_openssl::MakeTlsConnector;
 use pyo3::{pyclass, pymethods, Py, PyAny, PyObject, Python};
 use tokio::{sync::RwLock, task::AbortHandle};
-use tokio_postgres::{AsyncMessage, Client, Config, Connection, NoTls, Socket};
+use tokio_postgres::{AsyncMessage, Client, Config};
 
 use crate::{
     exceptions::rust_errors::{RustPSQLDriverError, RustPSQLDriverPyResult},
@@ -19,9 +18,6 @@ use crate::{
 
 use super::{
     common_options::SslMode,
-    transaction_options::{
-        IsolationLevel, ListenerTransactionConfig, ReadVariant, SynchronousCommit,
-    },
     utils::{build_tls, ConfiguredTLS},
 };
 
@@ -40,7 +36,7 @@ pub struct Listener {
 }
 
 impl Listener {
-    pub fn new(
+    #[must_use] pub fn new(
         // name: String,
         pg_config: Config,
         ca_file: Option<String>,
@@ -49,10 +45,10 @@ impl Listener {
     ) -> Self {
         Listener {
             // name: name,
-            pg_config: pg_config,
-            ca_file: ca_file,
+            pg_config,
+            ca_file,
             // transaction_config: transaction_config,
-            ssl_mode: ssl_mode,
+            ssl_mode,
             channel_callbacks: Default::default(),
             listen_abort_handler: Default::default(),
             client: Default::default(),
@@ -116,15 +112,15 @@ impl Listener {
                 match next_element {
                     Some(n) => match n {
                         tokio_postgres::AsyncMessage::Notification(n) => {
-                            println!("Notification {:?}", n);
+                            println!("Notification {n:?}");
                             return Ok(());
                         }
                         _ => {
-                            println!("in_in {:?}", n)
+                            println!("in_in {n:?}");
                         }
                     },
                     _ => {
-                        println!("in {:?}", next_element)
+                        println!("in {next_element:?}");
                     }
                 }
 
@@ -211,14 +207,14 @@ impl Listener {
                 match next_element {
                     Some(n) => match n {
                         tokio_postgres::AsyncMessage::Notification(n) => {
-                            println!("Notification {:?}", n);
+                            println!("Notification {n:?}");
                         }
                         _ => {
-                            println!("in_in {:?}", n)
+                            println!("in_in {n:?}");
                         }
                     },
                     _ => {
-                        println!("in {:?}", next_element)
+                        println!("in {next_element:?}");
                     }
                 }
             }
diff --git a/src/driver/utils.rs b/src/driver/utils.rs
@@ -197,7 +197,7 @@ pub fn build_tls(
     Ok(ConfiguredTLS::NoTls)
 }
 
-pub fn build_manager(
+#[must_use] pub fn build_manager(
     mgr_config: ManagerConfig,
     pg_config: Config,
     configured_tls: ConfiguredTLS,
@@ -212,5 +212,5 @@ pub fn build_manager(
         }
     }
 
-    return mgr;
+    mgr
 }

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ pub fn build_tls(`
`197`	`197`	`Ok(ConfiguredTLS::NoTls)`
`198`	`198`	`}`
`199`	`199`
`200`		`-pub fn build_manager(`
	`200`	`+#[must_use] pub fn build_manager(`
`201`	`201`	`mgr_config: ManagerConfig,`
`202`	`202`	`pg_config: Config,`
`203`	`203`	`configured_tls: ConfiguredTLS,`
`@@ -212,5 +212,5 @@ pub fn build_manager(`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
`215`		`- return mgr;`
	`215`	`+ mgr`
`216`	`216`	`}`