Replace stabilized futures-util APIs with std

Author: paolobarbolini

src/lib.rs

@@ -324,15 +324,15 @@ pub trait AsyncConnection: SimpleAsyncConnection + Sized + Send {
                 .map_err(|_| diesel::result::Error::RollbackTransaction)
                 .and_then(move |r| {
                     let _ = user_result_tx.send(r);
-                    futures_util::future::ready(Err(diesel::result::Error::RollbackTransaction))
+                    std::future::ready(Err(diesel::result::Error::RollbackTransaction))
                 })
                 .scope_boxed()
         })
         .then(move |_r| {
             let r = user_result_rx
                 .try_recv()
                 .expect("Transaction did not succeed");
-            futures_util::future::ready(r)
+            std::future::ready(r)
         })
     }
 

src/run_query_dsl/mod.rs

@@ -399,7 +399,7 @@ pub trait RunQueryDsl<Conn>: Sized {
     ///     .await?
     ///     .try_fold(Vec::new(), |mut acc, item| {
     ///          acc.push(item);
-    ///          futures_util::future::ready(Ok(acc))
+    ///          std::future::ready(Ok(acc))
     ///      })
     ///     .await?;
     /// assert_eq!(vec!["Sean", "Tess"], data);
@@ -428,7 +428,7 @@ pub trait RunQueryDsl<Conn>: Sized {
     ///     .await?
     ///     .try_fold(Vec::new(), |mut acc, item| {
     ///          acc.push(item);
-    ///          futures_util::future::ready(Ok(acc))
+    ///          std::future::ready(Ok(acc))
     ///      })
     ///     .await?;
     /// let expected_data = vec![
@@ -468,7 +468,7 @@ pub trait RunQueryDsl<Conn>: Sized {
     ///     .await?
     ///     .try_fold(Vec::new(), |mut acc, item| {
     ///          acc.push(item);
-    ///          futures_util::future::ready(Ok(acc))
+    ///          std::future::ready(Ok(acc))
     ///      })
     ///     .await?;
     /// let expected_data = vec![

src/stmt_cache.rs

@@ -1,12 +1,13 @@
 use diesel::connection::statement_cache::{MaybeCached, StatementCallbackReturnType};
 use diesel::QueryResult;
 use futures_core::future::BoxFuture;
-use futures_util::{future, FutureExt, TryFutureExt};
-use std::future::Future;
+use futures_util::future::Either;
+use futures_util::{FutureExt, TryFutureExt};
+use std::future::{self, Future};
 
 pub(crate) struct CallbackHelper<F>(pub(crate) F);
 
-type PrepareFuture<'a, C, S> = future::Either<
+type PrepareFuture<'a, C, S> = Either<
     future::Ready<QueryResult<(MaybeCached<'a, S>, C)>>,
     BoxFuture<'a, QueryResult<(MaybeCached<'a, S>, C)>>,
 >;
@@ -19,22 +20,22 @@ where
     type Return<'a> = PrepareFuture<'a, C, S>;
 
     fn from_error<'a>(e: diesel::result::Error) -> Self::Return<'a> {
-        future::Either::Left(future::ready(Err(e)))
+        Either::Left(future::ready(Err(e)))
     }
 
     fn map_to_no_cache<'a>(self) -> Self::Return<'a>
     where
         Self: 'a,
     {
-        future::Either::Right(
+        Either::Right(
             self.0
                 .map_ok(|(stmt, conn)| (MaybeCached::CannotCache(stmt), conn))
                 .boxed(),
         )
     }
 
     fn map_to_cache(stmt: &mut S, conn: C) -> Self::Return<'_> {
-        future::Either::Left(future::ready(Ok((MaybeCached::Cached(stmt), conn))))
+        Either::Left(future::ready(Ok((MaybeCached::Cached(stmt), conn))))
     }
 
     fn register_cache<'a>(
@@ -44,7 +45,7 @@ where
     where
         Self: 'a,
     {
-        future::Either::Right(
+        Either::Right(
             self.0
                 .map_ok(|(stmt, conn)| (MaybeCached::Cached(callback(stmt)), conn))
                 .boxed(),