From 07d2bb6c255ef546c1bf079b411d5fed66ad32a3 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Thu, 19 Mar 2015 20:04:43 -0700 Subject: [PATCH 1/5] Bump byteorder version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index f150964ab..1bc6713d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ openssl = "0.5" time = "0.1.14" log = "0.2" rustc-serialize = "0.3" -byteorder = "0.2.11" +byteorder = "0.3" [dependencies.uuid] optional = true From 07f380fcfb7ecd515468dbab78fcd4b967fefa68 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Fri, 20 Mar 2015 21:00:25 -0700 Subject: [PATCH 2/5] More feature updates --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 79d179ec1..e6d9e5a27 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -43,7 +43,7 @@ //! } //! ``` #![doc(html_root_url="https://sfackler.github.io/rust-postgres/doc")] -#![feature(unsafe_destructor, collections, io, core, debug_builders)] +#![feature(unsafe_destructor, io, core, debug_builders, str_char)] #![warn(missing_docs)] #![no_implicit_prelude] From 5e75155b7efd34ac0c1d7f930aec9ff5a9a5a071 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sat, 21 Mar 2015 15:32:49 -0700 Subject: [PATCH 3/5] Make time an optional dependency --- Cargo.toml | 5 ++++- src/lib.rs | 1 - src/types/time.rs | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1bc6713d3..9bd479dc5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,6 @@ phf_codegen = "0.6.11" [dependencies] phf = "0.6" openssl = "0.5" -time = "0.1.14" log = "0.2" rustc-serialize = "0.3" byteorder = "0.3" @@ -39,5 +38,9 @@ version = "0.1" optional = true version = "0.2" +[dependencies.time] +optional = true +version = "0.1.14" + [dev-dependencies] url = "0.2" diff --git a/src/lib.rs b/src/lib.rs index e6d9e5a27..1f87872c5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -53,7 +53,6 @@ extern crate log; extern crate openssl; extern crate phf; extern crate "rustc-serialize" as serialize; -extern crate time; #[cfg(feature = "unix_socket")] extern crate unix_socket; diff --git a/src/types/time.rs b/src/types/time.rs index 8d89ed5e1..b3c61f09b 100644 --- a/src/types/time.rs +++ b/src/types/time.rs @@ -1,9 +1,11 @@ +extern crate time; + use std::result::Result::{Ok, Err}; use std::marker::Sized; use std::clone::Clone; use byteorder::{ReadBytesExt, WriteBytesExt, BigEndian}; -use time::Timespec; +use self::time::Timespec; use std::io::prelude::*; use Result; From e4b0143de9cdafe1de342aed97ed149cec5b8580 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sun, 22 Mar 2015 11:11:22 -0700 Subject: [PATCH 4/5] Restore implicit prelude use --- src/error.rs | 5 ----- src/io_util.rs | 5 ----- src/lib.rs | 12 ------------ src/message.rs | 5 ----- src/types/json.rs | 4 ---- src/types/mod.rs | 9 --------- src/types/slice.rs | 4 ---- src/types/time.rs | 4 ---- src/types/uuid.rs | 5 ----- src/ugh_privacy.rs | 6 ------ src/url.rs | 7 ------- src/util.rs | 6 ------ 12 files changed, 72 deletions(-) diff --git a/src/error.rs b/src/error.rs index fc8daa8b2..fc9895824 100644 --- a/src/error.rs +++ b/src/error.rs @@ -1,10 +1,5 @@ pub use ugh_privacy::DbError; -use std::option::Option::{self, Some, None}; -use std::result::Result::Ok; -use std::clone::Clone; -use std::string::String; - use byteorder; use openssl::ssl::error::SslError; use phf; diff --git a/src/io_util.rs b/src/io_util.rs index dbf9cd69a..2661d09d0 100644 --- a/src/io_util.rs +++ b/src/io_util.rs @@ -1,8 +1,3 @@ -use std::option::Option::None; -use std::result::Result::{self, Ok, Err}; -#[cfg(feature = "unix_socket")] -use std::clone::Clone; - use openssl::ssl::{SslStream, MaybeSslStream}; use std::io; use std::io::prelude::*; diff --git a/src/lib.rs b/src/lib.rs index 1f87872c5..c7f420bd7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -45,7 +45,6 @@ #![doc(html_root_url="https://sfackler.github.io/rust-postgres/doc")] #![feature(unsafe_destructor, io, core, debug_builders, str_char)] #![warn(missing_docs)] -#![no_implicit_prelude] extern crate byteorder; #[macro_use] @@ -56,17 +55,6 @@ extern crate "rustc-serialize" as serialize; #[cfg(feature = "unix_socket")] extern crate unix_socket; -use std::option::Option::{self, Some, None}; -use std::result::Result::{Ok, Err}; -use std::boxed::Box; -use std::vec::Vec; -use std::clone::Clone; -use std::string::{String, ToString}; -use std::ops::Drop; -use std::iter::{Iterator, DoubleEndedIterator, ExactSizeIterator, IteratorExt}; -use std::prelude::v1::drop; -use std::marker::Send; - use openssl::crypto::hash::{self, Hasher}; use openssl::ssl::{SslContext, MaybeSslStream}; use serialize::hex::ToHex; diff --git a/src/message.rs b/src/message.rs index ddefd915e..6b9577ce3 100644 --- a/src/message.rs +++ b/src/message.rs @@ -1,8 +1,3 @@ -use std::result::Result::{Ok, Err}; -use std::option::Option::{self, None, Some}; -use std::vec::Vec; -use std::string::String; - use std::io; use std::io::prelude::*; use std::mem; diff --git a/src/types/json.rs b/src/types/json.rs index 8100b50eb..60c6e3582 100644 --- a/src/types/json.rs +++ b/src/types/json.rs @@ -1,7 +1,3 @@ -use std::marker::Sized; -use std::result::Result::{Ok, Err}; -use std::clone::Clone; - use serialize::json; use std::io::prelude::*; use byteorder::{ReadBytesExt, WriteBytesExt}; diff --git a/src/types/mod.rs b/src/types/mod.rs index 3dd6211a2..b9effb8a5 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -1,15 +1,6 @@ //! Traits dealing with Postgres data types pub use self::slice::Slice; -use std::option::Option::{self, Some, None}; -use std::result::Result::{Ok, Err}; -use std::boxed::Box; -use std::vec::Vec; -use std::clone::Clone; -use std::string::String; -use std::iter::ExactSizeIterator; -use std::marker::Sized; - use std::collections::HashMap; use std::fmt; use std::io::prelude::*; diff --git a/src/types/slice.rs b/src/types/slice.rs index 8c66bbc2a..b31ee53e7 100644 --- a/src/types/slice.rs +++ b/src/types/slice.rs @@ -1,7 +1,3 @@ -use std::result::Result::{Ok, Err}; -use std::marker::Sized; -use std::clone::Clone; - use std::io::prelude::*; use byteorder::{WriteBytesExt, BigEndian}; diff --git a/src/types/time.rs b/src/types/time.rs index b3c61f09b..e98d20659 100644 --- a/src/types/time.rs +++ b/src/types/time.rs @@ -1,9 +1,5 @@ extern crate time; -use std::result::Result::{Ok, Err}; -use std::marker::Sized; -use std::clone::Clone; - use byteorder::{ReadBytesExt, WriteBytesExt, BigEndian}; use self::time::Timespec; use std::io::prelude::*; diff --git a/src/types/uuid.rs b/src/types/uuid.rs index c97cafa78..dde69e9c0 100644 --- a/src/types/uuid.rs +++ b/src/types/uuid.rs @@ -1,10 +1,5 @@ extern crate uuid; -use std::result::Result::{Ok, Err}; -use std::marker::Sized; -use std::option::Option::{Some, None}; -use std::clone::Clone; - use std::io::prelude::*; use self::uuid::Uuid; diff --git a/src/ugh_privacy.rs b/src/ugh_privacy.rs index 584e90da7..a1bfbef01 100644 --- a/src/ugh_privacy.rs +++ b/src/ugh_privacy.rs @@ -1,9 +1,3 @@ -use std::option::Option::{self, Some, None}; -use std::result::Result::{Ok, Err}; -use std::vec::Vec; -use std::string::String; -use std::iter::IteratorExt; - use std::collections::HashMap; use std::error; use std::fmt; diff --git a/src/url.rs b/src/url.rs index d0f5a6688..6dbcaa27e 100644 --- a/src/url.rs +++ b/src/url.rs @@ -7,13 +7,6 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::option::Option::{self, Some, None}; -use std::result::Result::{self, Ok, Err}; -use std::vec::Vec; -use std::string::{String, ToString}; -use std::iter::{Iterator, IteratorExt, ExactSizeIterator}; -use std::str::Str; - use std::io::prelude::*; use std::str::FromStr; use std::num; diff --git a/src/util.rs b/src/util.rs index e980e1044..4b0e4f267 100644 --- a/src/util.rs +++ b/src/util.rs @@ -1,9 +1,3 @@ -use std::result::Result::{Ok, Err}; -use std::iter::Iterator; -use std::string::String; -use std::iter::IteratorExt; -use std::option::Option::None; - use std::io; use std::io::prelude::*; From dbe1d307d3dc9ae20fb1f3d2be5fa5b8edbb9597 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Mon, 23 Mar 2015 11:08:27 -0700 Subject: [PATCH 5/5] Release v0.7.3 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 9bd479dc5..0880f047f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "postgres" -version = "0.7.2" +version = "0.7.3" authors = ["Steven Fackler "] license = "MIT" description = "A native PostgreSQL driver"