Merge branch 'main' of git.asonix.dog:asonix/actix-form-data into main

Cargo.toml

@@ -13,7 +13,7 @@ edition = "2018"
 actix-multipart = "0.4.0-beta.5"
 actix-rt = "2.1.0"
 actix-web = { version = "4.0.0-beta.7", default-features = false }
-futures = "0.3.4"
+futures-util = "0.3.17"
 mime = "0.3.16"
 thiserror = "1.0"
 tokio = { version = "1", default-features = false, features = ["sync"] }

examples/simple.rs

@@ -3,7 +3,7 @@ use actix_web::{
     web::{post, resource},
     App, HttpResponse, HttpServer,
 };
-use futures::stream::StreamExt;
+use futures_util::stream::StreamExt;
 
 async fn upload(uploaded_content: Value<()>) -> HttpResponse {
     println!("Uploaded Content: {:#?}", uploaded_content);

examples/upload.rs

@@ -5,7 +5,7 @@ use actix_web::{
     web::{post, resource, Bytes},
     App, HttpResponse, HttpServer, ResponseError,
 };
-use futures::stream::{Stream, StreamExt, TryStreamExt};
+use futures_util::stream::{Stream, StreamExt, TryStreamExt};
 use std::{
     env,
     path::PathBuf,

src/lib.rs

@@ -30,7 +30,7 @@
 //!     web::{post, resource},
 //!     App, HttpResponse, HttpServer,
 //! };
-//! use futures::stream::StreamExt;
+//! use futures_util::stream::StreamExt;
 //!
 //! async fn upload(uploaded_content: Value<()>) -> HttpResponse {
 //!     println!("Uploaded Content: {:#?}", uploaded_content);

src/middleware.rs

@@ -26,9 +26,8 @@ use actix_web::{
     dev::{Payload, Service, ServiceRequest, Transform},
     FromRequest, HttpMessage, HttpRequest,
 };
-use futures::future::{ok, Ready};
 use std::{
-    future::Future,
+    future::{ready, Future, Ready},
     pin::Pin,
     task::{Context, Poll},
 };
@@ -74,10 +73,10 @@ where
     type Future = Ready<Result<Self::Transform, Self::InitError>>;
 
     fn new_transform(&self, service: S) -> Self::Future {
-        ok(MultipartMiddleware {
+        ready(Ok(MultipartMiddleware {
             form: self.clone(),
             service,
-        })
+        }))
     }
 }
 

src/types.rs

@@ -19,7 +19,7 @@
 
 use crate::Error;
 use actix_web::web::Bytes;
-use futures::Stream;
+use futures_util::Stream;
 use mime::Mime;
 use std::{
     collections::{HashMap, VecDeque},
@@ -220,7 +220,7 @@ impl<T> Field<T> {
     /// ```rust
     /// # use actix_form_data::{Form, Field};
     /// # use tokio::sync::mpsc::channel;
-    /// # use futures::stream::StreamExt;
+    /// # use futures_util::stream::StreamExt;
     /// #
     /// let (tx, rx) = channel(1);
     /// let form = Form::<()>::new().field("file-field", Field::file(move |_, _, mut stream| {

src/upload.rs

@@ -25,7 +25,7 @@ use crate::{
     },
 };
 use actix_web::web::BytesMut;
-use futures::{
+use futures_util::{
     select,
     stream::{FuturesUnordered, StreamExt},
 };