Merge pull request #935 from Some-Dood/deps/prefer-sub-crates

Deps: prefer sub-crates of `futures`

Author: sfackler

postgres-native-tls/Cargo.toml

@@ -16,12 +16,12 @@ default = ["runtime"]
 runtime = ["tokio-postgres/runtime"]
 
 [dependencies]
-futures = "0.3"
 native-tls = "0.2"
 tokio = "1.0"
 tokio-native-tls = "0.3"
 tokio-postgres = { version = "0.7.0", path = "../tokio-postgres", default-features = false }
 
 [dev-dependencies]
-tokio = { version = "1.0", features = ["full"] }
+futures-util = "0.3"
+tokio = { version = "1.0", features = ["macros", "net", "rt"] }
 postgres = { version = "0.19.0", path = "../postgres" }

postgres-native-tls/src/test.rs

@@ -1,4 +1,4 @@
-use futures::FutureExt;
+use futures_util::FutureExt;
 use native_tls::{self, Certificate};
 use tokio::net::TcpStream;
 use tokio_postgres::tls::TlsConnect;

postgres-openssl/Cargo.toml

@@ -16,12 +16,12 @@ default = ["runtime"]
 runtime = ["tokio-postgres/runtime"]
 
 [dependencies]
-futures = "0.3"
 openssl = "0.10"
 tokio = "1.0"
 tokio-openssl = "0.6"
 tokio-postgres = { version = "0.7.0", path = "../tokio-postgres", default-features = false }
 
 [dev-dependencies]
-tokio = { version = "1.0", features = ["full"] }
+futures-util = "0.3"
+tokio = { version = "1.0", features = ["macros", "net", "rt"] }
 postgres = { version = "0.19.0", path = "../postgres" }

postgres-openssl/src/lib.rs

@@ -73,14 +73,17 @@ use tokio_postgres::tls::{ChannelBinding, TlsConnect};
 #[cfg(test)]
 mod test;
 
+type ConfigCallback =
+    dyn Fn(&mut ConnectConfiguration, &str) -> Result<(), ErrorStack> + Sync + Send;
+
 /// A `MakeTlsConnect` implementation using the `openssl` crate.
 ///
 /// Requires the `runtime` Cargo feature (enabled by default).
 #[cfg(feature = "runtime")]
 #[derive(Clone)]
 pub struct MakeTlsConnector {
     connector: SslConnector,
-    config: Arc<dyn Fn(&mut ConnectConfiguration, &str) -> Result<(), ErrorStack> + Sync + Send>,
+    config: Arc<ConfigCallback>,
 }
 
 #[cfg(feature = "runtime")]

postgres-openssl/src/test.rs

@@ -1,4 +1,4 @@
-use futures::FutureExt;
+use futures_util::FutureExt;
 use openssl::ssl::{SslConnector, SslMethod};
 use tokio::net::TcpStream;
 use tokio_postgres::tls::TlsConnect;

postgres-types/src/special.rs

@@ -6,7 +6,7 @@ use std::{i32, i64};
 use crate::{FromSql, IsNull, ToSql, Type};
 
 /// A wrapper that can be used to represent infinity with `Type::Date` types.
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Date<T> {
     /// Represents `infinity`, a date that is later than all other dates.
     PosInfinity,
@@ -55,7 +55,7 @@ impl<T: ToSql> ToSql for Date<T> {
 
 /// A wrapper that can be used to represent infinity with `Type::Timestamp` and `Type::Timestamptz`
 /// types.
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Timestamp<T> {
     /// Represents `infinity`, a timestamp that is later than all other timestamps.
     PosInfinity,

postgres/Cargo.toml

@@ -37,11 +37,12 @@ with-time-0_3 = ["tokio-postgres/with-time-0_3"]
 [dependencies]
 bytes = "1.0"
 fallible-iterator = "0.2"
-futures = "0.3"
+futures-util = { version = "0.3", features = ["sink"] }
 tokio-postgres = { version = "0.7.6", path = "../tokio-postgres" }
 
 tokio = { version = "1.0", features = ["rt", "time"] }
 log = "0.4"
 
 [dev-dependencies]
 criterion = "0.3"
+tokio = { version = "1.0", features = ["rt-multi-thread"] }

postgres/src/binary_copy.rs

@@ -4,7 +4,7 @@ use crate::connection::ConnectionRef;
 use crate::types::{BorrowToSql, ToSql, Type};
 use crate::{CopyInWriter, CopyOutReader, Error};
 use fallible_iterator::FallibleIterator;
-use futures::StreamExt;
+use futures_util::StreamExt;
 use std::pin::Pin;
 #[doc(inline)]
 pub use tokio_postgres::binary_copy::BinaryCopyOutRow;

postgres/src/connection.rs

@@ -1,6 +1,5 @@
 use crate::{Error, Notification};
-use futures::future;
-use futures::{pin_mut, Stream};
+use futures_util::{future, pin_mut, Stream};
 use std::collections::VecDeque;
 use std::future::Future;
 use std::ops::{Deref, DerefMut};

postgres/src/copy_in_writer.rs

@@ -1,7 +1,7 @@
 use crate::connection::ConnectionRef;
 use crate::lazy_pin::LazyPin;
 use bytes::{Bytes, BytesMut};
-use futures::SinkExt;
+use futures_util::SinkExt;
 use std::io;
 use std::io::Write;
 use tokio_postgres::{CopyInSink, Error};