Cleanup

Author: sfackler

postgres-shared/src/error/mod.rs

@@ -1,3 +1,5 @@
+//! Errors.
+
 use fallible_iterator::FallibleIterator;
 use postgres_protocol::message::backend::ErrorFields;
 use std::error;

postgres-shared/src/stmt.rs

@@ -1,5 +1,7 @@
 use types::Type;
 
+/// Information about a column of a Postgres query.
+#[derive(Debug)]
 pub struct Column {
     name: String,
     type_: Type,
@@ -14,10 +16,12 @@ impl Column {
         }
     }
 
+    /// Returns the name of the column.
     pub fn name(&self) -> &str {
         &self.name
     }
 
+    /// Returns the type of the column.
     pub fn type_(&self) -> &Type {
         &self.type_
     }

postgres-shared/src/types/mod.rs

@@ -1,3 +1,5 @@
+//! Types.
+
 use fallible_iterator::FallibleIterator;
 use postgres_protocol;
 use postgres_protocol::types::{self, ArrayDimension};

postgres/src/rows.rs

@@ -11,6 +11,9 @@ use std::ops::Deref;
 use std::slice;
 use std::sync::Arc;
 
+#[doc(inline)]
+pub use postgres_shared::rows::RowIndex;
+
 use {Error, Result, StatementInfo};
 use error;
 use transaction::Transaction;
@@ -251,40 +254,6 @@ impl<'a> Row<'a> {
     }
 }
 
-/// A trait implemented by types that can index into columns of a row.
-pub trait RowIndex {
-    /// Returns the index of the appropriate column, or `None` if no such
-    /// column exists.
-    fn idx(&self, _: &[Column]) -> Option<usize>;
-}
-
-impl RowIndex for usize {
-    #[inline]
-    fn idx(&self, columns: &[Column]) -> Option<usize> {
-        if *self >= columns.len() {
-            None
-        } else {
-            Some(*self)
-        }
-    }
-}
-
-impl<'a> RowIndex for &'a str {
-    #[inline]
-    fn idx(&self, columns: &[Column]) -> Option<usize> {
-        if let Some(idx) = columns.iter().position(|d| d.name() == *self) {
-            return Some(idx);
-        };
-
-        // FIXME ASCII-only case insensitivity isn't really the right thing to
-        // do. Postgres itself uses a dubious wrapper around tolower and JDBC
-        // uses the US locale.
-        columns.iter().position(
-            |d| d.name().eq_ignore_ascii_case(*self),
-        )
-    }
-}
-
 /// A lazily-loaded iterator over the resulting rows of a query.
 pub struct LazyRows<'trans, 'stmt> {
     stmt: &'stmt Statement<'stmt>,

postgres/src/stmt.rs

@@ -9,6 +9,9 @@ use std::sync::Arc;
 use postgres_protocol::message::{backend, frontend};
 use postgres_shared::rows::RowData;
 
+#[doc(inline)]
+pub use postgres_shared::stmt::Column;
+
 use types::{Type, ToSql};
 use rows::{Rows, LazyRows};
 use transaction::Transaction;
@@ -554,32 +557,6 @@ fn fill_copy_buf<R: ReadWithInfo>(buf: &mut [u8], r: &mut R, info: &CopyInfo) ->
     Ok(nread)
 }
 
-/// Information about a column of the result of a query.
-#[derive(PartialEq, Eq, Clone, Debug)]
-pub struct Column {
-    name: String,
-    type_: Type,
-}
-
-impl Column {
-    pub(crate) fn new(name: String, type_: Type) -> Column {
-        Column {
-            name: name,
-            type_: type_,
-        }
-    }
-
-    /// The name of the column.
-    pub fn name(&self) -> &str {
-        &self.name
-    }
-
-    /// The type of the data in the column.
-    pub fn type_(&self) -> &Type {
-        &self.type_
-    }
-}
-
 /// A struct containing information relevant for a `COPY` operation.
 pub struct CopyInfo {
     format: Format,