update tests to use ScopedBoxFuture

Author: treysidechain

Cargo.lock

@@ -71,7 +71,8 @@ use diesel::query_builder::{AsQuery, QueryFragment, QueryId};
 use diesel::row::Row;
 use diesel::{ConnectionResult, QueryResult};
 use futures::{Future, Stream};
-use scoped_futures::ScopedBoxFuture;
+
+pub use scoped_futures::*;
 
 #[cfg(feature = "mysql")]
 mod mysql;
@@ -180,7 +181,7 @@ where
     /// ```rust
     /// # include!("doctest_setup.rs");
     /// use diesel::result::Error;
-    /// use futures::FutureExt;
+    /// use scoped_futures::ScopedFutureExt;
     ///
     /// # #[tokio::main(flavor = "current_thread")]
     /// # async fn main() {
@@ -200,7 +201,7 @@ where
     ///     assert_eq!(vec!["Sean", "Tess", "Ruby"], all_names);
     ///
     ///     Ok(())
-    /// }.boxed()).await?;
+    /// }.scope_boxed()).await?;
     ///
     /// conn.transaction::<(), _, _>(|conn| async move {
     ///     diesel::insert_into(users)
@@ -214,7 +215,7 @@ where
     ///     // If we want to roll back the transaction, but don't have an
     ///     // actual error to return, we can return `RollbackTransaction`.
     ///     Err(Error::RollbackTransaction)
-    /// }.boxed()).await;
+    /// }.scope_boxed()).await;
     ///
     /// let all_names = users.select(name).load::<String>(conn).await?;
     /// assert_eq!(vec!["Sean", "Tess", "Ruby"], all_names);

src/lib.rs

@@ -271,7 +271,7 @@ impl AsyncPgConnection {
     ///
     /// ```rust
     /// # include!("../doctest_setup.rs");
-    /// # use futures::FutureExt;
+    /// # use scoped_futures::ScopedFutureExt;
     /// #
     /// # #[tokio::main(flavor = "current_thread")]
     /// # async fn main() {
@@ -285,7 +285,7 @@ impl AsyncPgConnection {
     ///     .read_only()
     ///     .serializable()
     ///     .deferrable()
-    ///     .run(|conn| async move { Ok(()) }.boxed())
+    ///     .run(|conn| async move { Ok(()) }.scope_boxed())
     ///     .await
     /// # }
     /// ```

src/pg/mod.rs

@@ -3,7 +3,7 @@ use diesel::backend::Backend;
 use diesel::pg::Pg;
 use diesel::query_builder::{AstPass, QueryBuilder, QueryFragment};
 use diesel::QueryResult;
-use futures::future::BoxFuture;
+use scoped_futures::ScopedBoxFuture;
 
 /// Used to build a transaction, specifying additional details.
 ///
@@ -77,7 +77,7 @@ where
     ///         assert!(write_attempt.is_err());
     ///
     ///         Ok(())
-    ///     }) as _).await?;
+    ///     }).into()).await?;
     /// #     sql_query("DROP TABLE users_for_read_only").execute(conn).await?;
     /// #     Ok(())
     /// # }
@@ -127,7 +127,7 @@ where
     /// #       /*
     ///         Ok(())
     /// #       */
-    ///     }) as _)
+    ///     }).into())
     ///     .await
     /// # }
     /// ```
@@ -153,7 +153,7 @@ where
     /// #     let conn = &mut connection_no_transaction().await;
     /// conn.build_transaction()
     ///     .deferrable()
-    ///     .run(|conn| Box::pin(async { Ok(()) }))
+    ///     .run(|conn| Box::pin(async { Ok(()) }).into())
     ///     .await
     /// # }
     /// ```
@@ -182,7 +182,7 @@ where
     /// #     let conn = &mut connection_no_transaction().await;
     /// conn.build_transaction()
     ///     .not_deferrable()
-    ///     .run(|conn| Box::pin(async { Ok(()) }) as _)
+    ///     .run(|conn| Box::pin(async { Ok(()) }).into())
     ///     .await
     /// # }
     /// ```
@@ -211,7 +211,7 @@ where
     /// #     let conn = &mut connection_no_transaction().await;
     /// conn.build_transaction()
     ///     .read_committed()
-    ///     .run(|conn| Box::pin(async { Ok(()) }) as _)
+    ///     .run(|conn| Box::pin(async { Ok(()) }).into())
     ///     .await
     /// # }
     /// ```
@@ -237,7 +237,7 @@ where
     /// #     let conn = &mut connection_no_transaction().await;
     /// conn.build_transaction()
     ///     .repeatable_read()
-    ///     .run(|conn| Box::pin(async { Ok(()) }) as _)
+    ///     .run(|conn| Box::pin(async { Ok(()) }).into())
     ///     .await
     /// # }
     /// ```
@@ -263,7 +263,7 @@ where
     /// #     let conn = &mut connection_no_transaction().await;
     /// conn.build_transaction()
     ///     .serializable()
-    ///     .run(|conn| Box::pin(async { Ok(()) }) as _)
+    ///     .run(|conn| Box::pin(async { Ok(()) }).into())
     ///     .await
     /// # }
     /// ```
@@ -283,10 +283,11 @@ where
     /// the original error will be returned, otherwise the error generated by the rollback
     /// will be returned. In the second case the connection should be considered broken
     /// as it contains a uncommitted unabortable open transaction.
-    pub async fn run<T, E, F>(&mut self, f: F) -> Result<T, E>
+    pub async fn run<'b, T, E, F>(&mut self, f: F) -> Result<T, E>
     where
-        F: FnOnce(&mut C) -> BoxFuture<Result<T, E>> + Send,
-        E: From<diesel::result::Error>,
+        F: for<'r> FnOnce(&'r mut C) -> ScopedBoxFuture<'b, 'r, Result<T, E>> + Send + 'a,
+        T: 'b,
+        E: From<diesel::result::Error> + 'b,
     {
         let mut query_builder = <Pg as Backend>::QueryBuilder::default();
         self.to_sql(&mut query_builder, &Pg)?;

src/pg/transaction_builder.rs

@@ -1,7 +1,7 @@
 use diesel::prelude::{ExpressionMethods, OptionalExtension, QueryDsl};
 use diesel::QueryResult;
 use diesel_async::*;
-use scoped_futures::ScopedFutureExt;
+use futures::FutureExt;
 use std::fmt::Debug;
 
 #[cfg(feature = "postgres")]
@@ -11,7 +11,7 @@ mod type_check;
 async fn transaction_test(conn: &mut TestConnection) -> QueryResult<()> {
     let res = conn
         .transaction::<i32, diesel::result::Error, _>(|conn| {
-            async move {
+            Box::pin(async move {
                 let users: Vec<User> = users::table.load(conn).await?;
                 assert_eq!(&users[0].name, "John Doe");
                 assert_eq!(&users[1].name, "Jane Doe");
@@ -30,7 +30,7 @@ async fn transaction_test(conn: &mut TestConnection) -> QueryResult<()> {
                             assert_eq!(count, 3);
                             Ok(())
                         }
-                        .scope_boxed()
+                        .boxed().into()
                     })
                     .await;
                 assert!(res.is_ok());
@@ -47,8 +47,7 @@ async fn transaction_test(conn: &mut TestConnection) -> QueryResult<()> {
                 assert_eq!(count, 4);
 
                 Err(diesel::result::Error::RollbackTransaction)
-            }
-            .scope_boxed()
+            }).into()
         })
         .await;
     assert_eq!(