Uses futures-core APIs directly instead of futures-util re-exports

Author: paolobarbolini

Cargo.toml

@@ -13,6 +13,7 @@ description = "An async extension for Diesel the safe, extensible ORM and Query
 rust-version = "1.82.0"
 
 [dependencies]
+futures-core = "0.3.17"
 futures-channel = { version = "0.3.17", default-features = false, features = [
   "std",
   "sink",

src/async_connection_wrapper.rs

@@ -9,7 +9,7 @@
 //!   as replacement for the existing connection
 //!   implementations provided by diesel
 
-use futures_util::Stream;
+use futures_core::Stream;
 use futures_util::StreamExt;
 use std::future::Future;
 use std::pin::Pin;

src/lib.rs

@@ -78,8 +78,9 @@ use diesel::connection::{CacheSize, Instrumentation};
 use diesel::query_builder::{AsQuery, QueryFragment, QueryId};
 use diesel::row::Row;
 use diesel::{ConnectionResult, QueryResult};
-use futures_util::future::BoxFuture;
-use futures_util::{FutureExt, Stream};
+use futures_core::future::BoxFuture;
+use futures_core::Stream;
+use futures_util::FutureExt;
 use std::fmt::Debug;
 use std::future::Future;
 

src/mysql/mod.rs

@@ -11,8 +11,9 @@ use diesel::query_builder::QueryBuilder;
 use diesel::query_builder::{bind_collector::RawBytesBindCollector, QueryFragment, QueryId};
 use diesel::result::{ConnectionError, ConnectionResult};
 use diesel::QueryResult;
-use futures_util::future::BoxFuture;
-use futures_util::stream::{self, BoxStream};
+use futures_core::future::BoxFuture;
+use futures_core::stream::BoxStream;
+use futures_util::stream;
 use futures_util::{FutureExt, StreamExt, TryStreamExt};
 use mysql_async::prelude::Queryable;
 use mysql_async::{Opts, OptsBuilder, Statement};

src/pg/mod.rs

@@ -22,9 +22,10 @@ use diesel::query_builder::bind_collector::RawBytesBindCollector;
 use diesel::query_builder::{AsQuery, QueryBuilder, QueryFragment, QueryId};
 use diesel::result::{DatabaseErrorKind, Error};
 use diesel::{ConnectionError, ConnectionResult, QueryResult};
-use futures_util::future::BoxFuture;
+use futures_core::future::BoxFuture;
+use futures_core::stream::BoxStream;
 use futures_util::future::Either;
-use futures_util::stream::{BoxStream, TryStreamExt};
+use futures_util::stream::TryStreamExt;
 use futures_util::TryFutureExt;
 use futures_util::{FutureExt, StreamExt};
 use std::collections::{HashMap, HashSet};

src/pooled_connection/mod.rs

@@ -10,8 +10,8 @@ use crate::{TransactionManager, UpdateAndFetchResults};
 use diesel::associations::HasTable;
 use diesel::connection::{CacheSize, Instrumentation};
 use diesel::QueryResult;
-use futures_util::future::BoxFuture;
-use futures_util::{future, FutureExt};
+use futures_core::future::BoxFuture;
+use futures_util::FutureExt;
 use std::borrow::Cow;
 use std::fmt;
 use std::future::Future;
@@ -47,11 +47,10 @@ impl std::error::Error for PoolError {}
 
 /// Type of the custom setup closure passed to [`ManagerConfig::custom_setup`]
 pub type SetupCallback<C> =
-    Box<dyn Fn(&str) -> future::BoxFuture<diesel::ConnectionResult<C>> + Send + Sync>;
+    Box<dyn Fn(&str) -> BoxFuture<diesel::ConnectionResult<C>> + Send + Sync>;
 
 /// Type of the recycle check callback for the [`RecyclingMethod::CustomFunction`] variant
-pub type RecycleCheckCallback<C> =
-    dyn Fn(&mut C) -> future::BoxFuture<QueryResult<()>> + Send + Sync;
+pub type RecycleCheckCallback<C> = dyn Fn(&mut C) -> BoxFuture<QueryResult<()>> + Send + Sync;
 
 /// Possible methods of how a connection is recycled.
 #[derive(Default)]

src/run_query_dsl/mod.rs

@@ -3,8 +3,9 @@ use diesel::associations::HasTable;
 use diesel::query_builder::IntoUpdateTarget;
 use diesel::result::QueryResult;
 use diesel::AsChangeset;
-use futures_util::future::BoxFuture;
-use futures_util::{future, stream, FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt};
+use futures_core::future::BoxFuture;
+use futures_core::Stream;
+use futures_util::{future, stream, FutureExt, StreamExt, TryFutureExt, TryStreamExt};
 use std::future::Future;
 use std::pin::Pin;
 

src/stmt_cache.rs

@@ -1,13 +1,14 @@
 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;
 
 pub(crate) struct CallbackHelper<F>(pub(crate) F);
 
 type PrepareFuture<'a, C, S> = future::Either<
     future::Ready<QueryResult<(MaybeCached<'a, S>, C)>>,
-    future::BoxFuture<'a, QueryResult<(MaybeCached<'a, S>, C)>>,
+    BoxFuture<'a, QueryResult<(MaybeCached<'a, S>, C)>>,
 >;
 
 impl<S, F, C> StatementCallbackReturnType<S, C> for CallbackHelper<F>

src/sync_connection_wrapper/mod.rs

@@ -6,7 +6,7 @@
 //!
 //! * using a sync Connection implementation in async context
 //! * using the same code base for async crates needing multiple backends
-use futures_util::future::BoxFuture;
+use futures_core::future::BoxFuture;
 use std::error::Error;
 
 #[cfg(feature = "sqlite")]
@@ -100,7 +100,7 @@ mod implementation {
     };
     use diesel::row::IntoOwnedRow;
     use diesel::{ConnectionResult, QueryResult};
-    use futures_util::stream::BoxStream;
+    use futures_core::stream::BoxStream;
     use futures_util::{FutureExt, StreamExt, TryFutureExt};
     use std::marker::PhantomData;
     use std::sync::{Arc, Mutex};