update to minimal diff

Author: treysidechain

Cargo.lock

@@ -73,7 +73,7 @@ use diesel::{ConnectionResult, QueryResult};
 use futures::{Future, Stream};
 
 pub use scoped_futures;
-use scoped_futures::*;
+use scoped_futures::ScopedBoxFuture;
 
 #[cfg(feature = "mysql")]
 mod mysql;

src/lib.rs

@@ -77,7 +77,7 @@ where
     ///         assert!(write_attempt.is_err());
     ///
     ///         Ok(())
-    ///     }).into()).await?;
+    ///     }) as _).await?;
     /// #     sql_query("DROP TABLE users_for_read_only").execute(conn).await?;
     /// #     Ok(())
     /// # }
@@ -127,7 +127,7 @@ where
     /// #       /*
     ///         Ok(())
     /// #       */
-    ///     }).into())
+    ///     }) as _)
     ///     .await
     /// # }
     /// ```
@@ -153,7 +153,7 @@ where
     /// #     let conn = &mut connection_no_transaction().await;
     /// conn.build_transaction()
     ///     .deferrable()
-    ///     .run(|conn| Box::pin(async { Ok(()) }).into())
+    ///     .run(|conn| Box::pin(async { Ok(()) }))
     ///     .await
     /// # }
     /// ```
@@ -182,7 +182,7 @@ where
     /// #     let conn = &mut connection_no_transaction().await;
     /// conn.build_transaction()
     ///     .not_deferrable()
-    ///     .run(|conn| Box::pin(async { Ok(()) }).into())
+    ///     .run(|conn| Box::pin(async { Ok(()) }) as _)
     ///     .await
     /// # }
     /// ```
@@ -211,7 +211,7 @@ where
     /// #     let conn = &mut connection_no_transaction().await;
     /// conn.build_transaction()
     ///     .read_committed()
-    ///     .run(|conn| Box::pin(async { Ok(()) }).into())
+    ///     .run(|conn| Box::pin(async { Ok(()) }) as _)
     ///     .await
     /// # }
     /// ```
@@ -237,7 +237,7 @@ where
     /// #     let conn = &mut connection_no_transaction().await;
     /// conn.build_transaction()
     ///     .repeatable_read()
-    ///     .run(|conn| Box::pin(async { Ok(()) }).into())
+    ///     .run(|conn| Box::pin(async { Ok(()) }) as _)
     ///     .await
     /// # }
     /// ```
@@ -263,7 +263,7 @@ where
     /// #     let conn = &mut connection_no_transaction().await;
     /// conn.build_transaction()
     ///     .serializable()
-    ///     .run(|conn| Box::pin(async { Ok(()) }).into())
+    ///     .run(|conn| Box::pin(async { Ok(()) }) as _)
     ///     .await
     /// # }
     /// ```

src/pg/transaction_builder.rs

@@ -1,8 +1,9 @@
 use diesel::prelude::{ExpressionMethods, OptionalExtension, QueryDsl};
 use diesel::QueryResult;
 use diesel_async::*;
-use futures::FutureExt;
+use scoped_futures::ScopedFutureExt;
 use std::fmt::Debug;
+use std::pin::Pin;
 
 #[cfg(feature = "postgres")]
 mod custom_types;
@@ -30,7 +31,7 @@ async fn transaction_test(conn: &mut TestConnection) -> QueryResult<()> {
                             assert_eq!(count, 3);
                             Ok(())
                         }
-                        .boxed().into()
+                        .scope_boxed()
                     })
                     .await;
                 assert!(res.is_ok());
@@ -47,7 +48,7 @@ async fn transaction_test(conn: &mut TestConnection) -> QueryResult<()> {
                 assert_eq!(count, 4);
 
                 Err(diesel::result::Error::RollbackTransaction)
-            }).into()
+            }) as Pin<Box<_>>
         })
         .await;
     assert_eq!(