Rename to GenericClient

Author: sfackler

postgres/src/client.rs

@@ -1,5 +1,5 @@
 use crate::{
-    CancelToken, Config, CopyInWriter, CopyOutReader, GenericConnection, RowIter, Statement,
+    CancelToken, Config, CopyInWriter, CopyOutReader, GenericClient, RowIter, Statement,
     ToStatement, Transaction,
 };
 use std::ops::{Deref, DerefMut};
@@ -494,22 +494,25 @@ impl Client {
     }
 }
 
-impl GenericConnection for Client {
+impl GenericClient for Client {
     fn execute<T>(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<u64, Error>
     where
         T: ?Sized + ToStatement,
     {
         self.execute(query, params)
     }
+
     fn query<T>(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<Vec<Row>, Error>
     where
         T: ?Sized + ToStatement,
     {
         self.query(query, params)
     }
+
     fn prepare(&mut self, query: &str) -> Result<Statement, Error> {
         self.prepare(query)
     }
+
     fn transaction(&mut self) -> Result<Transaction<'_>, Error> {
         self.transaction()
     }

postgres/src/generic_connection.rs renamed to postgres/src/generic_client.rs

@@ -3,7 +3,7 @@ use tokio_postgres::types::ToSql;
 use tokio_postgres::{Error, Row};
 
 /// A trait allowing abstraction over connections and transactions
-pub trait GenericConnection {
+pub trait GenericClient {
     /// Like `Client::execute`.
     fn execute<T>(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<u64, Error>
     where

postgres/src/lib.rs

@@ -61,7 +61,7 @@ pub use crate::copy_in_writer::CopyInWriter;
 pub use crate::copy_out_reader::CopyOutReader;
 #[doc(no_inline)]
 pub use crate::error::Error;
-pub use crate::generic_connection::GenericConnection;
+pub use crate::generic_client::GenericClient;
 #[doc(no_inline)]
 pub use crate::row::{Row, SimpleQueryRow};
 pub use crate::row_iter::RowIter;
@@ -75,7 +75,7 @@ mod client;
 pub mod config;
 mod copy_in_writer;
 mod copy_out_reader;
-mod generic_connection;
+mod generic_client;
 mod lazy_pin;
 mod row_iter;
 mod transaction;

postgres/src/transaction.rs

@@ -1,5 +1,5 @@
 use crate::{
-    CancelToken, CopyInWriter, CopyOutReader, GenericConnection, Portal, RowIter, Rt, Statement,
+    CancelToken, CopyInWriter, CopyOutReader, GenericClient, Portal, RowIter, Rt, Statement,
     ToStatement,
 };
 use tokio::runtime::Runtime;
@@ -186,22 +186,25 @@ impl<'a> Transaction<'a> {
     }
 }
 
-impl<'a> GenericConnection for Transaction<'a> {
+impl<'a> GenericClient for Transaction<'a> {
     fn execute<T>(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<u64, Error>
     where
         T: ?Sized + ToStatement,
     {
         self.execute(query, params)
     }
+
     fn query<T>(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<Vec<Row>, Error>
     where
         T: ?Sized + ToStatement,
     {
         self.query(query, params)
     }
+
     fn prepare(&mut self, query: &str) -> Result<Statement, Error> {
         self.prepare(query)
     }
+
     fn transaction(&mut self) -> Result<Transaction<'_>, Error> {
         self.transaction()
     }