actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-09-02 01:31:57 +02:00
Code Issues Releases Wiki Activity

web: Minimize futures dependencies

Browse Source
This commit is contained in:
Yuki Okushi
2020-05-18 11:47:20 +09:00
parent d7abbff3b0
commit a98e53ecb8
29 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/types/form.rs
View File

@@ -9,8 +9,8 @@ use std::{fmt, ops};
use actix_http::{Error, HttpMessage, Payload, Response};
use bytes::BytesMut;
use encoding_rs::{Encoding, UTF_8};
use futures::future::{err, ok, FutureExt, LocalBoxFuture, Ready};
use futures::StreamExt;
use futures_util::future::{err, ok, FutureExt, LocalBoxFuture, Ready};
use futures_util::StreamExt;
use serde::de::DeserializeOwned;
use serde::Serialize;

4
src/types/json.rs
View File

@@ -7,8 +7,8 @@ use std::task::{Context, Poll};
use std::{fmt, ops};
use bytes::BytesMut;
use futures::future::{err, ok, FutureExt, LocalBoxFuture, Ready};
use futures::StreamExt;
use futures_util::future::{err, ok, FutureExt, LocalBoxFuture, Ready};
use futures_util::StreamExt;
use serde::de::DeserializeOwned;
use serde::Serialize;

2
src/types/path.rs
View File

@@ -4,7 +4,7 @@ use std::{fmt, ops};
use actix_http::error::{Error, ErrorNotFound};
use actix_router::PathDeserializer;
use futures::future::{ready, Ready};
use futures_util::future::{ready, Ready};
use serde::de;
use crate::dev::Payload;

14
src/types/payload.rs
View File

@@ -8,8 +8,9 @@ use actix_http::error::{Error, ErrorBadRequest, PayloadError};
use actix_http::HttpMessage;
use bytes::{Bytes, BytesMut};
use encoding_rs::UTF_8;
use futures::future::{err, ok, Either, FutureExt, LocalBoxFuture, Ready};
use futures::{Stream, StreamExt};
use futures_core::stream::Stream;
use futures_util::future::{err, ok, Either, FutureExt, LocalBoxFuture, Ready};
use futures_util::StreamExt;
use mime::Mime;
use crate::dev;
@@ -22,9 +23,10 @@ use crate::request::HttpRequest;
/// ## Example
///
/// ```rust
/// use futures::{Future, Stream, StreamExt};
/// use actix_web::{web, error, App, Error, HttpResponse};
///
/// use std::future::Future;
/// use futures_core::stream::Stream;
/// use futures_util::StreamExt;
/// /// extract binary data from request
/// async fn index(mut body: web::Payload) -> Result<HttpResponse, Error>
/// {
@@ -70,8 +72,10 @@ impl Stream for Payload {
/// ## Example
///
/// ```rust
/// use futures::{Future, Stream, StreamExt};
/// use actix_web::{web, error, App, Error, HttpResponse};
/// use std::future::Future;
/// use futures_core::stream::Stream;
/// use futures_util::StreamExt;
///
/// /// extract binary data from request
/// async fn index(mut body: web::Payload) -> Result<HttpResponse, Error>

2
src/types/query.rs
View File

@@ -4,7 +4,7 @@ use std::sync::Arc;
use std::{fmt, ops};
use actix_http::error::Error;
use futures::future::{err, ok, Ready};
use futures_util::future::{err, ok, Ready};
use serde::de;
use crate::dev::Payload;

4
src/types/readlines.rs
View File

@@ -5,7 +5,7 @@ use std::task::{Context, Poll};
use bytes::{Bytes, BytesMut};
use encoding_rs::{Encoding, UTF_8};
use futures::Stream;
use futures_util::stream::Stream;
use crate::dev::Payload;
use crate::error::{PayloadError, ReadlinesError};
@@ -172,7 +172,7 @@ where
#[cfg(test)]
mod tests {
use futures::stream::StreamExt;
use futures_util::stream::StreamExt;
use super::*;
use crate::test::TestRequest;