Merge branch 'release-v0.5.2' into release

sfackler · sfackler · commit 1e55b2148a20 · 2015-11-07T16:51:54.000-08:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "postgres_array"
-version = "0.5.1"
+version = "0.5.2"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 license = "MIT"
 description = "Array support for rust-postgres"
 repository = "https://github.com/sfackler/rust-postgres-array"
-documentation = "https://sfackler.github.io/rust-postgres-array/doc/v0.5.1/postgres_array"
+documentation = "https://sfackler.github.io/rust-postgres-array/doc/v0.5.2/postgres_array"
 
 [dependencies]
 postgres = ">= 0.9, < 0.11"
-byteorder = "0.3"
+byteorder = ">= 0.3, < 0.5"
 
 [dev-dependencies]
 rustc-serialize = "0.3"
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # rust-postgres-array
 [![Build Status](https://travis-ci.org/sfackler/rust-postgres-array.svg?branch=master)](https://travis-ci.org/sfackler/rust-postgres-array)
 
-Support for PostgreSQL arrays in [rust-postgres](https://github.com/sfackler/rust-postgres).
+[Documentation](https://sfackler.github.io/rust-postgres-array/doc/v0.5.2/postgres_array)
 
-Documentation is available at https://sfackler.github.io/rust-postgres-array/doc/v0.5.1/postgres_array.
+Support for PostgreSQL arrays in [rust-postgres](https://github.com/sfackler/rust-postgres).
diff --git a/src/array.rs b/src/array.rs
@@ -6,13 +6,13 @@ use std::fmt;
 use Dimension;
 
 /// A multi-dimensional array.
-#[derive(PartialEq, Eq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub struct Array<T> {
     dims: Vec<Dimension>,
     data: Vec<T>,
 }
 
-impl<T: fmt::Debug> fmt::Debug for Array<T> {
+impl<T: fmt::Display> fmt::Display for Array<T> {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         if self.dims.iter().any(|dim| dim.lower_bound != 1) {
             for dim in &self.dims {
@@ -30,9 +30,9 @@ fn fmt_helper<'a, T, I>(depth: usize,
                         mut data: &mut I,
                         fmt: &mut fmt::Formatter)
                         -> fmt::Result
-        where I: Iterator<Item=&'a T>, T: 'a+fmt::Debug {
+        where I: Iterator<Item=&'a T>, T: 'a + fmt::Display {
     if depth == dims.len() {
-        return write!(fmt, "{:?}", data.next().unwrap());
+        return write!(fmt, "{}", data.next().unwrap());
     }
 
     try!(write!(fmt, "{{"));
@@ -262,7 +262,7 @@ impl<T> IntoIterator for Array<T> {
     }
 }
 
-/// An iterator over references to values of an `ArrayBase` in the
+/// An iterator over references to values of an `Array` in the
 /// higher-dimensional equivalent of row-major order.
 pub struct Iter<'a, T: 'a> {
     inner: slice::Iter<'a, T>,
@@ -282,7 +282,7 @@ impl<'a, T: 'a> DoubleEndedIterator for Iter<'a, T> {
     }
 }
 
-/// An iterator over mutable references to values of an `ArrayBase` in the
+/// An iterator over mutable references to values of an `Array` in the
 /// higher-dimensional equivalent of row-major order.
 pub struct IterMut<'a, T: 'a> {
     inner: slice::IterMut<'a, T>,
@@ -302,7 +302,7 @@ impl<'a, T: 'a> DoubleEndedIterator for IterMut<'a, T> {
     }
 }
 
-/// An iterator over values of an `ArrayBase` in the higher-dimensional
+/// An iterator over values of an `Array` in the higher-dimensional
 /// equivalent of row-major order.
 pub struct IntoIter<T> {
     inner: vec::IntoIter<T>,
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,5 +1,5 @@
 //! Multi-dimensional arrays with per-dimension specifiable lower bounds
-#![doc(html_root_url="https://sfackler.github.io/rust-postgres-array/doc/v0.5.1")]
+#![doc(html_root_url="https://sfackler.github.io/rust-postgres-array/doc/v0.5.2")]
 
 #[macro_use(to_sql_checked)]
 extern crate postgres;
@@ -120,17 +120,17 @@ mod tests {
     }
 
     #[test]
-    fn test_debug() {
+    fn test_display() {
         let a = Array::from_vec(vec![0i32, 1, 2, 3, 4], 1);
-        assert_eq!("{0,1,2,3,4}", &format!("{:?}", a));
+        assert_eq!("{0,1,2,3,4}", &format!("{}", a));
 
         let a = Array::from_vec(vec![0i32, 1, 2, 3, 4], -3);
-        assert_eq!("[-3:1]={0,1,2,3,4}", &format!("{:?}", a));
+        assert_eq!("[-3:1]={0,1,2,3,4}", &format!("{}", a));
 
         let mut a = Array::from_vec(vec![1i32, 2, 3], 3);
         a.wrap(-2);
         a.push(Array::from_vec(vec![4, 5, 6], 3));
         a.wrap(1);
-        assert_eq!("[1:1][-2:-1][3:5]={{{1,2,3},{4,5,6}}}", &format!("{:?}", a));
+        assert_eq!("[1:1][-2:-1][3:5]={{{1,2,3},{4,5,6}}}", &format!("{}", a));
     }
 }
