Remove internals traits

Author: sfackler

postgres/src/lib.rs

@@ -98,7 +98,7 @@ use tls::TlsHandshake;
 use notification::{Notifications, Notification};
 use params::{IntoConnectParams, User};
 use priv_io::MessageStream;
-use rows::{Rows, LazyRows};
+use rows::Rows;
 use stmt::{Statement, Column};
 use transaction::{Transaction, IsolationLevel};
 use types::{IsNull, Kind, Type, Oid, ToSql, FromSql, Field, OID, NAME, CHAR};
@@ -1467,58 +1467,3 @@ fn err(fields: &mut ErrorFields) -> Error {
         Err(err) => Error::Io(err),
     }
 }
-
-trait RowsNew {
-    fn new(stmt: &Statement, data: Vec<RowData>) -> Rows<'static>;
-}
-
-trait LazyRowsNew<'trans, 'stmt> {
-    fn new(
-        stmt: &'stmt Statement<'stmt>,
-        data: VecDeque<RowData>,
-        name: String,
-        row_limit: i32,
-        more_rows: bool,
-        finished: bool,
-        trans: &'trans Transaction<'trans>,
-    ) -> LazyRows<'trans, 'stmt>;
-}
-
-trait StatementInternals<'conn> {
-    fn new(
-        conn: &'conn Connection,
-        info: Arc<StatementInfo>,
-        next_portal_id: Cell<u32>,
-        finished: bool,
-    ) -> Statement<'conn>;
-
-    fn conn(&self) -> &'conn Connection;
-
-    fn info(&self) -> &Arc<StatementInfo>;
-
-    fn into_query(self, params: &[&ToSql]) -> Result<Rows<'static>>;
-}
-
-trait ColumnNew {
-    fn new(name: String, type_: Type) -> Column;
-}
-
-trait NotificationsNew<'conn> {
-    fn new(conn: &'conn Connection) -> Notifications<'conn>;
-}
-
-trait TransactionInternals<'conn> {
-    fn new(conn: &'conn Connection, depth: u32) -> Transaction<'conn>;
-
-    fn conn(&self) -> &'conn Connection;
-
-    fn depth(&self) -> u32;
-}
-
-trait ConfigInternals {
-    fn build_command(&self, s: &mut String);
-}
-
-trait IsolationLevelNew {
-    fn new(level: &str) -> Result<IsolationLevel>;
-}

postgres/src/notification.rs

@@ -8,7 +8,7 @@ use postgres_protocol::message::backend;
 #[doc(inline)]
 pub use postgres_shared::Notification;
 
-use {desynchronized, Result, Connection, NotificationsNew};
+use {desynchronized, Result, Connection};
 use error::Error;
 
 /// Notifications from the Postgres backend.
@@ -25,6 +25,10 @@ impl<'a> fmt::Debug for Notifications<'a> {
 }
 
 impl<'conn> Notifications<'conn> {
+    pub(crate) fn new(conn: &'conn Connection) -> Notifications<'conn> {
+        Notifications { conn: conn }
+    }
+
     /// Returns the number of pending notifications.
     pub fn len(&self) -> usize {
         self.conn.0.borrow().notifications.len()
@@ -78,12 +82,6 @@ impl<'a, 'conn> IntoFallibleIterator for &'a Notifications<'conn> {
     }
 }
 
-impl<'conn> NotificationsNew<'conn> for Notifications<'conn> {
-    fn new(conn: &'conn Connection) -> Notifications<'conn> {
-        Notifications { conn: conn }
-    }
-}
-
 /// A fallible iterator over pending notifications.
 pub struct Iter<'a> {
     conn: &'a Connection,

postgres/src/rows.rs

@@ -12,7 +12,7 @@ use std::slice;
 use std::sync::Arc;
 use std::marker::PhantomData;
 
-use {Result, RowsNew, LazyRowsNew, StatementInternals, StatementInfo};
+use {Result, StatementInfo};
 use transaction::Transaction;
 use types::{FromSql, WrongType};
 use stmt::{Statement, Column};
@@ -42,16 +42,6 @@ pub struct Rows<'compat> {
     _marker: PhantomData<&'compat u8>,
 }
 
-impl RowsNew for Rows<'static> {
-    fn new(stmt: &Statement, data: Vec<RowData>) -> Rows<'static> {
-        Rows {
-            stmt_info: stmt.info().clone(),
-            data: data,
-            _marker: PhantomData,
-        }
-    }
-}
-
 impl<'a> fmt::Debug for Rows<'a> {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         fmt.debug_struct("Rows")
@@ -61,6 +51,16 @@ impl<'a> fmt::Debug for Rows<'a> {
     }
 }
 
+impl Rows<'static> {
+    pub(crate) fn new(stmt: &Statement, data: Vec<RowData>) -> Rows<'static> {
+        Rows {
+            stmt_info: stmt.info().clone(),
+            data: data,
+            _marker: PhantomData,
+        }
+    }
+}
+
 impl<'rows> Rows<'rows> {
     /// Returns a slice describing the columns of the `Rows`.
     pub fn columns(&self) -> &[Column] {
@@ -302,28 +302,6 @@ pub struct LazyRows<'trans, 'stmt> {
     _trans: &'trans Transaction<'trans>,
 }
 
-impl<'trans, 'stmt> LazyRowsNew<'trans, 'stmt> for LazyRows<'trans, 'stmt> {
-    fn new(
-        stmt: &'stmt Statement<'stmt>,
-        data: VecDeque<RowData>,
-        name: String,
-        row_limit: i32,
-        more_rows: bool,
-        finished: bool,
-        trans: &'trans Transaction<'trans>,
-    ) -> LazyRows<'trans, 'stmt> {
-        LazyRows {
-            stmt: stmt,
-            data: data,
-            name: name,
-            row_limit: row_limit,
-            more_rows: more_rows,
-            finished: finished,
-            _trans: trans,
-        }
-    }
-}
-
 impl<'a, 'b> Drop for LazyRows<'a, 'b> {
     fn drop(&mut self) {
         if !self.finished {
@@ -344,6 +322,26 @@ impl<'a, 'b> fmt::Debug for LazyRows<'a, 'b> {
 }
 
 impl<'trans, 'stmt> LazyRows<'trans, 'stmt> {
+    pub(crate) fn new(
+        stmt: &'stmt Statement<'stmt>,
+        data: VecDeque<RowData>,
+        name: String,
+        row_limit: i32,
+        more_rows: bool,
+        finished: bool,
+        trans: &'trans Transaction<'trans>,
+    ) -> LazyRows<'trans, 'stmt> {
+        LazyRows {
+            stmt: stmt,
+            data: data,
+            name: name,
+            row_limit: row_limit,
+            more_rows: more_rows,
+            finished: finished,
+            _trans: trans,
+        }
+    }
+
     fn finish_inner(&mut self) -> Result<()> {
         let mut conn = self.stmt.conn().0.borrow_mut();
         check_desync!(conn);

postgres/src/stmt.rs

@@ -13,8 +13,7 @@ use error::Error;
 use types::{Type, ToSql};
 use rows::{Rows, LazyRows};
 use transaction::Transaction;
-use {bad_response, err, Connection, StatementInternals, Result, RowsNew, LazyRowsNew, ColumnNew,
-     StatementInfo, TransactionInternals};
+use {bad_response, err, Connection, Result, StatementInfo};
 
 /// A prepared statement.
 pub struct Statement<'conn> {
@@ -36,8 +35,8 @@ impl<'conn> Drop for Statement<'conn> {
     }
 }
 
-impl<'conn> StatementInternals<'conn> for Statement<'conn> {
-    fn new(
+impl<'conn> Statement<'conn> {
+    pub(crate) fn new(
         conn: &'conn Connection,
         info: Arc<StatementInfo>,
         next_portal_id: Cell<u32>,
@@ -51,23 +50,21 @@ impl<'conn> StatementInternals<'conn> for Statement<'conn> {
         }
     }
 
-    fn info(&self) -> &Arc<StatementInfo> {
+    pub(crate) fn info(&self) -> &Arc<StatementInfo> {
         &self.info
     }
 
-    fn conn(&self) -> &'conn Connection {
+    pub(crate) fn conn(&self) -> &'conn Connection {
         self.conn
     }
 
-    fn into_query(self, params: &[&ToSql]) -> Result<Rows<'static>> {
+    pub(crate) fn into_query(self, params: &[&ToSql]) -> Result<Rows<'static>> {
         check_desync!(self.conn);
         let mut rows = vec![];
         self.inner_query("", 0, params, |row| rows.push(row))?;
         Ok(Rows::new(&self, rows))
     }
-}
 
-impl<'conn> Statement<'conn> {
     fn finish_inner(&mut self) -> Result<()> {
         if self.finished {
             Ok(())
@@ -563,16 +560,14 @@ pub struct Column {
     type_: Type,
 }
 
-impl ColumnNew for Column {
-    fn new(name: String, type_: Type) -> Column {
+impl Column {
+    pub(crate) fn new(name: String, type_: Type) -> Column {
         Column {
             name: name,
             type_: type_,
         }
     }
-}
 
-impl Column {
     /// The name of the column.
     pub fn name(&self) -> &str {
         &self.name

postgres/src/transaction.rs

@@ -4,7 +4,7 @@ use std::cell::Cell;
 use std::fmt;
 use std::ascii::AsciiExt;
 
-use {bad_response, Result, Connection, TransactionInternals, ConfigInternals, IsolationLevelNew};
+use {bad_response, Result, Connection};
 use error::Error;
 use rows::Rows;
 use stmt::Statement;
@@ -31,8 +31,8 @@ pub enum IsolationLevel {
     Serializable,
 }
 
-impl IsolationLevelNew for IsolationLevel {
-    fn new(raw: &str) -> Result<IsolationLevel> {
+impl IsolationLevel {
+    pub(crate) fn new(raw: &str) -> Result<IsolationLevel> {
         if raw.eq_ignore_ascii_case("READ UNCOMMITTED") {
             Ok(IsolationLevel::ReadUncommitted)
         } else if raw.eq_ignore_ascii_case("READ COMMITTED") {
@@ -45,9 +45,7 @@ impl IsolationLevelNew for IsolationLevel {
             Err(Error::Io(bad_response()))
         }
     }
-}
 
-impl IsolationLevel {
     fn to_sql(&self) -> &'static str {
         match *self {
             IsolationLevel::ReadUncommitted => "READ UNCOMMITTED",
@@ -76,8 +74,8 @@ impl Default for Config {
     }
 }
 
-impl ConfigInternals for Config {
-    fn build_command(&self, s: &mut String) {
+impl Config {
+    pub(crate) fn build_command(&self, s: &mut String) {
         let mut first = true;
 
         if let Some(isolation_level) = self.isolation_level {
@@ -109,9 +107,7 @@ impl ConfigInternals for Config {
             }
         }
     }
-}
 
-impl Config {
     /// Creates a new `Config` with no configuration overrides.
     pub fn new() -> Config {
         Config::default()
@@ -172,8 +168,8 @@ impl<'conn> Drop for Transaction<'conn> {
     }
 }
 
-impl<'conn> TransactionInternals<'conn> for Transaction<'conn> {
-    fn new(conn: &'conn Connection, depth: u32) -> Transaction<'conn> {
+impl<'conn> Transaction<'conn> {
+    pub(crate) fn new(conn: &'conn Connection, depth: u32) -> Transaction<'conn> {
         Transaction {
             conn: conn,
             depth: depth,
@@ -183,16 +179,14 @@ impl<'conn> TransactionInternals<'conn> for Transaction<'conn> {
         }
     }
 
-    fn conn(&self) -> &'conn Connection {
+    pub(crate) fn conn(&self) -> &'conn Connection {
         self.conn
     }
 
-    fn depth(&self) -> u32 {
+    pub(crate) fn depth(&self) -> u32 {
         self.depth
     }
-}
 
-impl<'conn> Transaction<'conn> {
     fn finish_inner(&mut self) -> Result<()> {
         let mut conn = self.conn.0.borrow_mut();
         debug_assert!(self.depth == conn.trans_depth);

tokio-postgres/src/lib.rs

@@ -1139,24 +1139,3 @@ where
 {
     io::Error::new(io::ErrorKind::InvalidInput, "unexpected message").into()
 }
-
-trait RowNew {
-    fn new(columns: Arc<Vec<Column>>, data: RowData) -> Row;
-}
-
-trait StatementNew {
-    fn new(
-        close_sender: Sender<(u8, String)>,
-        name: String,
-        params: Vec<Type>,
-        columns: Arc<Vec<Column>>,
-    ) -> Statement;
-
-    fn columns_arc(&self) -> &Arc<Vec<Column>>;
-
-    fn name(&self) -> &str;
-}
-
-trait TransactionNew {
-    fn new(c: Connection) -> Transaction;
-}

tokio-postgres/src/rows.rs

@@ -9,7 +9,6 @@ use std::sync::Arc;
 #[doc(inline)]
 pub use postgres_shared::rows::RowIndex;
 
-use RowNew;
 use types::{WrongType, FromSql};
 
 /// A row from Postgres.
@@ -18,16 +17,14 @@ pub struct Row {
     data: RowData,
 }
 
-impl RowNew for Row {
-    fn new(columns: Arc<Vec<Column>>, data: RowData) -> Row {
+impl Row {
+    pub(crate) fn new(columns: Arc<Vec<Column>>, data: RowData) -> Row {
         Row {
             columns: columns,
             data: data,
         }
     }
-}
 
-impl Row {
     /// Returns information about the columns in the row.
     pub fn columns(&self) -> &[Column] {
         &self.columns