diff --git a/src/error.rs b/src/error.rs index 12840b30..6586ba1d 100644 --- a/src/error.rs +++ b/src/error.rs @@ -3,7 +3,6 @@ use collections::HashMap; use std::from_str::FromStr; use std::io::IoError; -use std::vec_ng::Vec; use openssl::ssl::error::SslError; use phf::PhfMap; diff --git a/src/lib.rs b/src/lib.rs index c729ac12..cb8431a9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -90,7 +90,6 @@ use std::io::net::tcp::TcpStream; use std::mem; use std::str; use std::task; -use std::vec_ng::Vec; use error::{DnsError, InvalidUrl, diff --git a/src/message.rs b/src/message.rs index a9f07c25..9ec07c21 100644 --- a/src/message.rs +++ b/src/message.rs @@ -1,8 +1,6 @@ use std::str; use std::io::{IoResult, MemWriter, MemReader}; use std::mem; -use std::vec; -use std::vec_ng::Vec; use types::Oid; diff --git a/src/stmt.rs b/src/stmt.rs index de213deb..78382bd6 100644 --- a/src/stmt.rs +++ b/src/stmt.rs @@ -2,7 +2,6 @@ use collections::{Deque, RingBuf}; use std::cell::Cell; use std::from_str::FromStr; use std::task; -use std::vec_ng::Vec; use PostgresConnection; use error::{PgDbError, diff --git a/src/types/array.rs b/src/types/array.rs index 6215470e..680f7ad1 100644 --- a/src/types/array.rs +++ b/src/types/array.rs @@ -1,8 +1,7 @@ //! Multi-dimensional arrays with per-dimension specifiable lower bounds use std::cast; -use std::vec; -use std::vec_ng::Vec; +use std::slice; /// Information about a dimension of an array #[deriving(Eq, Clone, Show)] @@ -145,7 +144,7 @@ impl ArrayBase { /// Returns an iterator over the values in this array, in the /// higher-dimensional equivalent of row-major order. - pub fn values<'a>(&'a self) -> vec::Items<'a, T> { + pub fn values<'a>(&'a self) -> slice::Items<'a, T> { self.data.iter() } } diff --git a/src/types/mod.rs b/src/types/mod.rs index 00ad9be5..76e7470f 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -8,8 +8,6 @@ use serialize::json::Json; use std::io::{MemWriter, BufReader}; use std::io::util::LimitReader; use std::str; -use std::vec; -use std::vec_ng::Vec; use time::Timespec; use self::array::{Array, ArrayBase, DimensionInfo}; diff --git a/src/types/range.rs b/src/types/range.rs index 9e0cbed4..e51eeaa9 100644 --- a/src/types/range.rs +++ b/src/types/range.rs @@ -1,7 +1,6 @@ //! Types dealing with ranges of values #[macro_escape]; -use std::cmp; use std::fmt; use std::i32; use std::i64; diff --git a/submodules/rust-openssl b/submodules/rust-openssl index a881f7d0..761901d0 160000 --- a/submodules/rust-openssl +++ b/submodules/rust-openssl @@ -1 +1 @@ -Subproject commit a881f7d0081b66ed0545231de0ab7a67114893bf +Subproject commit 761901d0e409304450a49d784bae989d125c68b2 diff --git a/submodules/rust-phf b/submodules/rust-phf index 25d1640c..aecec520 160000 --- a/submodules/rust-phf +++ b/submodules/rust-phf @@ -1 +1 @@ -Subproject commit 25d1640c9b44d77cdc3cec408d0c577948d31014 +Subproject commit aecec520a41a70a4e9861dd4875232e3690907ea