Skip to content

Commit 2f3bb68

Browse files
Uses std APIs directly instead of futures-util re-exports
1 parent bf66d1d commit 2f3bb68

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

src/async_connection_wrapper.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
//! as replacement for the existing connection
1010
//! implementations provided by diesel
1111
12-
use futures_util::Future;
1312
use futures_util::Stream;
1413
use futures_util::StreamExt;
14+
use std::future::Future;
1515
use std::pin::Pin;
1616

1717
/// This is a helper trait that allows to customize the

src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@ use diesel::query_builder::{AsQuery, QueryFragment, QueryId};
7979
use diesel::row::Row;
8080
use diesel::{ConnectionResult, QueryResult};
8181
use futures_util::future::BoxFuture;
82-
use futures_util::{Future, FutureExt, Stream};
82+
use futures_util::{FutureExt, Stream};
8383
use std::fmt::Debug;
84+
use std::future::Future;
8485

8586
pub use scoped_futures;
8687
use scoped_futures::{ScopedBoxFuture, ScopedFutureExt};

src/mysql/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ use diesel::result::{ConnectionError, ConnectionResult};
1313
use diesel::QueryResult;
1414
use futures_util::future::BoxFuture;
1515
use futures_util::stream::{self, BoxStream};
16-
use futures_util::{Future, FutureExt, StreamExt, TryStreamExt};
16+
use futures_util::{FutureExt, StreamExt, TryStreamExt};
1717
use mysql_async::prelude::Queryable;
1818
use mysql_async::{Opts, OptsBuilder, Statement};
19+
use std::future::Future;
1920

2021
mod error_helper;
2122
mod row;

src/pg/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ use futures_util::future::BoxFuture;
2626
use futures_util::future::Either;
2727
use futures_util::stream::{BoxStream, TryStreamExt};
2828
use futures_util::TryFutureExt;
29-
use futures_util::{Future, FutureExt, StreamExt};
29+
use futures_util::{FutureExt, StreamExt};
3030
use std::collections::{HashMap, HashSet};
31+
use std::future::Future;
3132
use std::sync::Arc;
3233
use tokio::sync::broadcast;
3334
use tokio::sync::oneshot;

0 commit comments

Comments
 (0)