Fix some warnings

sfackler · sfackler · commit bb3ebbf943c2 · 2018-01-09T21:15:35.000-08:00
diff --git a/postgres-shared/src/types/bit_vec.rs b/postgres-shared/src/types/bit_vec.rs
@@ -4,7 +4,7 @@ use postgres_protocol::types;
 use self::bit_vec::BitVec;
 use std::error::Error;
 
-use types::{FromSql, ToSql, IsNull, Type, BIT, VARBIT};
+use types::{FromSql, IsNull, ToSql, Type, BIT, VARBIT};
 
 impl FromSql for BitVec {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<BitVec, Box<Error + Sync + Send>> {
@@ -21,7 +21,7 @@ impl FromSql for BitVec {
 }
 
 impl ToSql for BitVec {
-    fn to_sql(&self, _: &Type, mut out: &mut Vec<u8>) -> Result<IsNull, Box<Error + Sync + Send>> {
+    fn to_sql(&self, _: &Type, out: &mut Vec<u8>) -> Result<IsNull, Box<Error + Sync + Send>> {
         types::varbit_to_sql(self.len(), self.to_bytes().into_iter(), out)?;
         Ok(IsNull::No)
     }
diff --git a/postgres-shared/src/types/chrono.rs b/postgres-shared/src/types/chrono.rs
@@ -1,11 +1,11 @@
 extern crate chrono;
 
 use postgres_protocol::types;
-use self::chrono::{Duration, NaiveDate, NaiveTime, NaiveDateTime, DateTime, Utc, Local,
-                   FixedOffset};
+use self::chrono::{DateTime, Duration, FixedOffset, Local, NaiveDate, NaiveDateTime, NaiveTime,
+                   Utc};
 use std::error::Error;
 
-use types::{FromSql, ToSql, IsNull, Type, TIMESTAMP, TIMESTAMPTZ, DATE, TIME};
+use types::{FromSql, IsNull, ToSql, Type, DATE, TIME, TIMESTAMP, TIMESTAMPTZ};
 
 fn base() -> NaiveDateTime {
     NaiveDate::from_ymd(2000, 1, 1).and_hms(0, 0, 0)
@@ -62,11 +62,7 @@ impl FromSql for DateTime<Local> {
 }
 
 impl ToSql for DateTime<Local> {
-    fn to_sql(
-        &self,
-        type_: &Type,
-        mut w: &mut Vec<u8>,
-    ) -> Result<IsNull, Box<Error + Sync + Send>> {
+    fn to_sql(&self, type_: &Type, w: &mut Vec<u8>) -> Result<IsNull, Box<Error + Sync + Send>> {
         self.with_timezone(&Utc).to_sql(type_, w)
     }
 
diff --git a/postgres-shared/src/types/rustc_serialize.rs b/postgres-shared/src/types/rustc_serialize.rs
@@ -4,7 +4,7 @@ use self::rustc_serialize::json;
 use std::io::{Read, Write};
 use std::error::Error;
 
-use types::{FromSql, ToSql, IsNull, Type, JSON, JSONB};
+use types::{FromSql, IsNull, ToSql, Type, JSON, JSONB};
 
 impl FromSql for json::Json {
     fn from_sql(ty: &Type, mut raw: &[u8]) -> Result<json::Json, Box<Error + Sync + Send>> {
@@ -23,7 +23,7 @@ impl FromSql for json::Json {
 }
 
 impl ToSql for json::Json {
-    fn to_sql(&self, ty: &Type, mut out: &mut Vec<u8>) -> Result<IsNull, Box<Error + Sync + Send>> {
+    fn to_sql(&self, ty: &Type, out: &mut Vec<u8>) -> Result<IsNull, Box<Error + Sync + Send>> {
         if *ty == JSONB {
             out.push(1);
         }
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
@@ -49,7 +49,7 @@ tokio-dns-unofficial = "0.1"
 tokio-io = "0.1"
 
 tokio-openssl = { version = "0.1", optional = true }
-openssl = { version = "0.9", optional = true }
+openssl = { version = "0.9.23", optional = true }
 
 [target.'cfg(unix)'.dependencies]
 tokio-uds = "0.1"
diff --git a/tokio-postgres/src/lib.rs b/tokio-postgres/src/lib.rs
diff --git a/tokio-postgres/src/test.rs b/tokio-postgres/src/test.rs

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ use postgres_protocol::types;`
`4`	`4`	`use self::bit_vec::BitVec;`
`5`	`5`	`use std::error::Error;`
`6`	`6`
`7`		`-use types::{FromSql, ToSql, IsNull, Type, BIT, VARBIT};`
	`7`	`+use types::{FromSql, IsNull, ToSql, Type, BIT, VARBIT};`
`8`	`8`
`9`	`9`	`impl FromSql for BitVec {`
`10`	`10`	`fn from_sql(_: &Type, raw: &[u8]) -> Result<BitVec, Box<Error + Sync + Send>> {`
`@@ -21,7 +21,7 @@ impl FromSql for BitVec {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`impl ToSql for BitVec {`
`24`		`- fn to_sql(&self, _: &Type, mut out: &mut Vec<u8>) -> Result<IsNull, Box<Error + Sync + Send>> {`
	`24`	`+ fn to_sql(&self, _: &Type, out: &mut Vec<u8>) -> Result<IsNull, Box<Error + Sync + Send>> {`
`25`	`25`	`types::varbit_to_sql(self.len(), self.to_bytes().into_iter(), out)?;`
`26`	`26`	`Ok(IsNull::No)`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ use self::rustc_serialize::json;`
`4`	`4`	`use std::io::{Read, Write};`
`5`	`5`	`use std::error::Error;`
`6`	`6`
`7`		`-use types::{FromSql, ToSql, IsNull, Type, JSON, JSONB};`
	`7`	`+use types::{FromSql, IsNull, ToSql, Type, JSON, JSONB};`
`8`	`8`
`9`	`9`	`impl FromSql for json::Json {`
`10`	`10`	`fn from_sql(ty: &Type, mut raw: &[u8]) -> Result<json::Json, Box<Error + Sync + Send>> {`
`@@ -23,7 +23,7 @@ impl FromSql for json::Json {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`impl ToSql for json::Json {`
`26`		`- fn to_sql(&self, ty: &Type, mut out: &mut Vec<u8>) -> Result<IsNull, Box<Error + Sync + Send>> {`
	`26`	`+ fn to_sql(&self, ty: &Type, out: &mut Vec<u8>) -> Result<IsNull, Box<Error + Sync + Send>> {`
`27`	`27`	`if *ty == JSONB {`
`28`	`28`	`out.push(1);`
`29`	`29`	`}`