diff --git a/Cargo.toml b/Cargo.toml index cbbadac..b1a036a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "actix-form-data" description = "Multipart Form Data for Actix Web" -version = "0.6.0-beta.4" +version = "0.6.0-beta.5" license = "GPL-3.0" authors = ["asonix "] repository = "https://git.asonix.dog/Aardwolf/actix-form-data.git" @@ -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"] } diff --git a/examples/simple.rs b/examples/simple.rs index 58a6dae..80d5a18 100644 --- a/examples/simple.rs +++ b/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); diff --git a/examples/upload.rs b/examples/upload.rs index 1b48c85..32db37e 100644 --- a/examples/upload.rs +++ b/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, pin::Pin, diff --git a/src/lib.rs b/src/lib.rs index fd70480..65d4ff9 100644 --- a/src/lib.rs +++ b/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); diff --git a/src/middleware.rs b/src/middleware.rs index 442c075..36e004a 100644 --- a/src/middleware.rs +++ b/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, ready, Future}, pin::Pin, task::{Context, Poll}, }; @@ -70,10 +69,10 @@ where type Future = Ready>; fn new_transform(&self, service: S) -> Self::Future { - ok(MultipartMiddleware { + ready(Ok(MultipartMiddleware { form: self.clone(), service, - }) + })) } } diff --git a/src/types.rs b/src/types.rs index a35be65..0c3ae15 100644 --- a/src/types.rs +++ b/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}, @@ -208,7 +208,7 @@ impl Field { /// ```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| { diff --git a/src/upload.rs b/src/upload.rs index f753110..cd80849 100644 --- a/src/upload.rs +++ b/src/upload.rs @@ -25,7 +25,7 @@ use crate::{ }, }; use actix_web::web::BytesMut; -use futures::{ +use futures_util::{ select, stream::{FuturesUnordered, StreamExt}, };