actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-25 06:39:22 +02:00
Code Issues Releases Wiki Activity

http: Minimize futures dependencies

Browse Source
This commit is contained in:
Yuki Okushi
2020-05-18 11:45:26 +09:00
parent 9bd6407730
commit 292af145cb
11 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actix-http/tests/test_client.rs
View File

@ -1,6 +1,6 @@
use actix_service::ServiceFactory;
use bytes::Bytes;
use futures::future::{self, ok};
use futures_util::future::{self, ok};
use actix_http::{http, HttpService, Request, Response};
use actix_http_test::test_server;

4
actix-http/tests/test_openssl.rs
View File

@ -5,8 +5,8 @@ use actix_http_test::test_server;
use actix_service::{fn_service, ServiceFactory};
use bytes::{Bytes, BytesMut};
use futures::future::{err, ok, ready};
use futures::stream::{once, Stream, StreamExt};
use futures_util::future::{err, ok, ready};
use futures_util::stream::{once, Stream, StreamExt};
use open_ssl::ssl::{AlpnError, SslAcceptor, SslFiletype, SslMethod};
use actix_http::error::{ErrorBadRequest, PayloadError};

4
actix-http/tests/test_rustls.rs
View File

@ -7,8 +7,8 @@ use actix_http_test::test_server;
use actix_service::{fn_factory_with_config, fn_service};
use bytes::{Bytes, BytesMut};
use futures::future::{self, err, ok};
use futures::stream::{once, Stream, StreamExt};
use futures_util::future::{self, err, ok};
use futures_util::stream::{once, Stream, StreamExt};
use rust_tls::{
internal::pemfile::{certs, pkcs8_private_keys},
NoClientAuth, ServerConfig as RustlsServerConfig,

4
actix-http/tests/test_server.rs
View File

@ -6,8 +6,8 @@ use actix_http_test::test_server;
use actix_rt::time::delay_for;
use actix_service::fn_service;
use bytes::Bytes;
use futures::future::{self, err, ok, ready, FutureExt};
use futures::stream::{once, StreamExt};
use futures_util::future::{self, err, ok, ready, FutureExt};
use futures_util::stream::{once, StreamExt};
use regex::Regex;
use actix_http::httpmessage::HttpMessage;

7
actix-http/tests/test_ws.rs
View File

@ -1,4 +1,5 @@
use std::cell::Cell;
use std::future::Future;
use std::marker::PhantomData;
use std::pin::Pin;
use std::sync::{Arc, Mutex};
@ -9,9 +10,9 @@ use actix_http_test::test_server;
use actix_service::{fn_factory, Service};
use actix_utils::framed::Dispatcher;
use bytes::Bytes;
use futures::future;
use futures::task::{Context, Poll};
use futures::{Future, SinkExt, StreamExt};
use futures_util::future;
use futures_util::task::{Context, Poll};
use futures_util::{SinkExt, StreamExt};
struct WsService<T>(Arc<Mutex<(PhantomData<T>, Cell<bool>)>>);