Merge branch 'release-v0.6.0' into release

sfackler · sfackler · commit d2e78c636dd6 · 2016-01-03T15:35:58.000-08:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "postgres_array"
-version = "0.5.2"
+version = "0.6.0"
 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.2/postgres_array"
+documentation = "https://sfackler.github.io/rust-postgres-array/doc/v0.6.0/postgres_array"
 
 [dependencies]
-postgres = ">= 0.9, < 0.11"
+postgres = "0.11"
 byteorder = ">= 0.3, < 0.5"
 
 [dev-dependencies]
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)
 
-[Documentation](https://sfackler.github.io/rust-postgres-array/doc/v0.5.2/postgres_array)
+[Documentation](https://sfackler.github.io/rust-postgres-array/doc/v0.6.0/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
@@ -192,34 +192,33 @@ tuple_impl!(a: isize, b: isize, c: isize, d: isize, e: isize, f: isize, g: isize
 tuple_impl!(a: isize, b: isize, c: isize, d: isize, e: isize, f: isize, g: isize, h: isize);
 tuple_impl!(a: isize, b: isize, c: isize, d: isize, e: isize, f: isize, g: isize, h: isize, i: isize);
 
+/// Indexes into the `Array`, retrieving a reference to the contained
+/// value.
+///
+/// Since `Array`s can be multi-dimensional, the `Index` trait is
+/// implemented for a variety of index types. In the most generic case, a
+/// `&[isize]` can be used. In addition, a bare `isize` as well as tuples
+/// of up to 10 `isize` values may be used for convenience.
+///
+/// # Panics
+///
+/// Panics if the index does not correspond to an in-bounds element of the
+/// `Array`.
+///
+/// # Examples
+///
+/// ```rust
+/// # use postgres_array::Array;
+/// let mut array = Array::from_vec(vec![0i32, 1, 2, 3], 0);
+/// assert_eq!(2, array[2]);
+///
+/// array.wrap(0);
+/// array.push(Array::from_vec(vec![4, 5, 6, 7], 0));
+///
+/// assert_eq!(6, array[(1, 2)]);
+/// ```
 impl<T, I: ArrayIndex> Index<I> for Array<T> {
     type Output = T;
-
-    /// Indexes into the `Array`, retrieving a reference to the contained
-    /// value.
-    ///
-    /// Since `Array`s can be multi-dimensional, the `Index` trait is
-    /// implemented for a variety of index types. In the most generic case, a
-    /// `&[isize]` can be used. In addition, a bare `isize` as well as tuples
-    /// of up to 10 `isize` values may be used for convenience.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the index does not correspond to an in-bounds element of the
-    /// `Array`.
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// # use postgres_array::Array;
-    /// let mut array = Array::from_vec(vec![0i32, 1, 2, 3], 0);
-    /// assert_eq!(2, array[2]);
-    ///
-    /// array.wrap(0);
-    /// array.push(Array::from_vec(vec![4, 5, 6, 7], 0));
-    ///
-    /// assert_eq!(6, array[(1, 2)]);
-    /// ```
     fn index(&self, idx: I) -> &T {
         let idx = idx.index(self);
         &self.data[idx]
diff --git a/src/impls.rs b/src/impls.rs
@@ -21,7 +21,7 @@ impl<T> FromSql for Array<Option<T>> where T: FromSql {
         let _element_type: Oid = try!(raw.read_u32::<BigEndian>());
 
         let mut dim_info = Vec::with_capacity(ndim);
-        for _ in (0..ndim) {
+        for _ in 0..ndim {
             dim_info.push(Dimension {
                 len: try!(raw.read_u32::<BigEndian>()) as usize,
                 lower_bound: try!(raw.read_i32::<BigEndian>()) as isize,
@@ -34,7 +34,7 @@ impl<T> FromSql for Array<Option<T>> where T: FromSql {
         };
 
         let mut elements = Vec::with_capacity(nele);
-        for _ in (0..nele) {
+        for _ in 0..nele {
             let len = try!(raw.read_i32::<BigEndian>());
             if len < 0 {
                 elements.push(None);
@@ -128,7 +128,7 @@ mod test {
     use Array;
 
     fn test_type<T: PartialEq+FromSql+ToSql, S: fmt::Display>(sql_type: &str, checks: &[(T, S)]) {
-        let conn = Connection::connect("postgres://postgres@localhost", &SslMode::None).unwrap();
+        let conn = Connection::connect("postgres://postgres@localhost", SslMode::None).unwrap();
         for &(ref val, ref repr) in checks.iter() {
             let stmt = conn.prepare(&format!("SELECT {}::{}", *repr, sql_type)).unwrap();
             let result = stmt.query(&[]).unwrap().iter().next().unwrap().get(0);
@@ -224,7 +224,7 @@ mod test {
 
     #[test]
     fn test_empty_array() {
-        let conn = Connection::connect("postgres://postgres@localhost", &SslMode::None).unwrap();
+        let conn = Connection::connect("postgres://postgres@localhost", SslMode::None).unwrap();
         let stmt = conn.prepare("SELECT '{}'::INT4[]").unwrap();
         stmt.query(&[]).unwrap().iter().next().unwrap().get::<_, Array<Option<i32>>>(0);
     }
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.2")]
+#![doc(html_root_url="https://sfackler.github.io/rust-postgres-array/doc/v0.6.0")]
 
 #[macro_use(to_sql_checked)]
 extern crate postgres;
