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

cleanup imports

Browse Source
This commit is contained in:
Nikolay Kim
2019-12-13 11:24:57 +06:00
parent b81417c2fa
commit c1deaaeb2f
31 changed files with 104 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awc/CHANGES.md
View File

@ -1,5 +1,9 @@
# Changes
## [1.0.0] - 2019-12-13
* Release
## [1.0.0-alpha.3]
* Migrate to `std::future`

3
awc/Cargo.toml
View File

@ -42,7 +42,7 @@ actix-rt = "1.0.0"
base64 = "0.11"
bytes = "0.5.2"
derive_more = "0.99.2"
futures = "0.3.1"
futures-core = "0.3.1"
log =" 0.4"
mime = "0.3"
percent-encoding = "2.1"
@ -63,5 +63,6 @@ actix-server = "1.0.0"
actix-tls = { version = "1.0.0", features=["openssl", "rustls"] }
brotli = "3.3.0"
flate2 = "1.0.13"
futures = "0.3.1"
env_logger = "0.6"
webpki = "0.21"

78
awc/src/connect.rs
View File

@ -1,3 +1,4 @@
use std::future::Future;
use std::pin::Pin;
use std::rc::Rc;
use std::task::{Context, Poll};
@ -12,7 +13,6 @@ use actix_http::h1::ClientCodec;
use actix_http::http::HeaderMap;
use actix_http::{RequestHead, RequestHeadType, ResponseHead};
use actix_service::Service;
use futures::future::{FutureExt, LocalBoxFuture};
use crate::response::ClientResponse;
@ -24,7 +24,7 @@ pub(crate) trait Connect {
head: RequestHead,
body: Body,
addr: Option<net::SocketAddr>,
) -> LocalBoxFuture<'static, Result<ClientResponse, SendRequestError>>;
) -> Pin<Box<dyn Future<Output = Result<ClientResponse, SendRequestError>>>>;
fn send_request_extra(
&mut self,
@ -32,16 +32,22 @@ pub(crate) trait Connect {
extra_headers: Option<HeaderMap>,
body: Body,
addr: Option<net::SocketAddr>,
) -> LocalBoxFuture<'static, Result<ClientResponse, SendRequestError>>;
) -> Pin<Box<dyn Future<Output = Result<ClientResponse, SendRequestError>>>>;
/// Send request, returns Response and Framed
fn open_tunnel(
&mut self,
head: RequestHead,
addr: Option<net::SocketAddr>,
) -> LocalBoxFuture<
'static,
Result<(ResponseHead, Framed<BoxedSocket, ClientCodec>), SendRequestError>,
) -> Pin<
Box<
dyn Future<
Output = Result<
(ResponseHead, Framed<BoxedSocket, ClientCodec>),
SendRequestError,
>,
>,
>,
>;
/// Send request and extra headers, returns Response and Framed
@ -50,9 +56,15 @@ pub(crate) trait Connect {
head: Rc<RequestHead>,
extra_headers: Option<HeaderMap>,
addr: Option<net::SocketAddr>,
) -> LocalBoxFuture<
'static,
Result<(ResponseHead, Framed<BoxedSocket, ClientCodec>), SendRequestError>,
) -> Pin<
Box<
dyn Future<
Output = Result<
(ResponseHead, Framed<BoxedSocket, ClientCodec>),
SendRequestError,
>,
>,
>,
>;
}
@ -70,14 +82,14 @@ where
head: RequestHead,
body: Body,
addr: Option<net::SocketAddr>,
) -> LocalBoxFuture<'static, Result<ClientResponse, SendRequestError>> {
) -> Pin<Box<dyn Future<Output = Result<ClientResponse, SendRequestError>>>> {
// connect to the host
let fut = self.0.call(ClientConnect {
uri: head.uri.clone(),
addr,
});
async move {
Box::pin(async move {
let connection = fut.await?;
// send request
@ -85,8 +97,7 @@ where
.send_request(RequestHeadType::from(head), body)
.await
.map(|(head, payload)| ClientResponse::new(head, payload))
}
.boxed_local()
})
}
fn send_request_extra(
@ -95,14 +106,14 @@ where
extra_headers: Option<HeaderMap>,
body: Body,
addr: Option<net::SocketAddr>,
) -> LocalBoxFuture<'static, Result<ClientResponse, SendRequestError>> {
) -> Pin<Box<dyn Future<Output = Result<ClientResponse, SendRequestError>>>> {
// connect to the host
let fut = self.0.call(ClientConnect {
uri: head.uri.clone(),
addr,
});
async move {
Box::pin(async move {
let connection = fut.await?;
// send request
@ -111,17 +122,22 @@ where
.await?;
Ok(ClientResponse::new(head, payload))
}
.boxed_local()
})
}
fn open_tunnel(
&mut self,
head: RequestHead,
addr: Option<net::SocketAddr>,
) -> LocalBoxFuture<
'static,
Result<(ResponseHead, Framed<BoxedSocket, ClientCodec>), SendRequestError>,
) -> Pin<
Box<
dyn Future<
Output = Result<
(ResponseHead, Framed<BoxedSocket, ClientCodec>),
SendRequestError,
>,
>,
>,
> {
// connect to the host
let fut = self.0.call(ClientConnect {
@ -129,7 +145,7 @@ where
addr,
});
async move {
Box::pin(async move {
let connection = fut.await?;
// send request
@ -138,8 +154,7 @@ where
let framed = framed.map_io(|io| BoxedSocket(Box::new(Socket(io))));
Ok((head, framed))
}
.boxed_local()
})
}
fn open_tunnel_extra(
@ -147,9 +162,15 @@ where
head: Rc<RequestHead>,
extra_headers: Option<HeaderMap>,
addr: Option<net::SocketAddr>,
) -> LocalBoxFuture<
'static,
Result<(ResponseHead, Framed<BoxedSocket, ClientCodec>), SendRequestError>,
) -> Pin<
Box<
dyn Future<
Output = Result<
(ResponseHead, Framed<BoxedSocket, ClientCodec>),
SendRequestError,
>,
>,
>,
> {
// connect to the host
let fut = self.0.call(ClientConnect {
@ -157,7 +178,7 @@ where
addr,
});
async move {
Box::pin(async move {
let connection = fut.await?;
// send request
@ -167,8 +188,7 @@ where
let framed = framed.map_io(|io| BoxedSocket(Box::new(Socket(io))));
Ok((head, framed))
}
.boxed_local()
})
}
}

2
awc/src/frozen.rs
View File

@ -4,7 +4,7 @@ use std::rc::Rc;
use std::time::Duration;
use bytes::Bytes;
use futures::Stream;
use futures_core::Stream;
use serde::Serialize;
use actix_http::body::Body;

2
awc/src/request.rs
View File

@ -5,7 +5,7 @@ use std::time::Duration;
use std::{fmt, net};
use bytes::Bytes;
use futures::Stream;
use futures_core::Stream;
use percent_encoding::percent_encode;
use serde::Serialize;

2
awc/src/response.rs
View File

@ -5,7 +5,7 @@ use std::pin::Pin;
use std::task::{Context, Poll};
use bytes::{Bytes, BytesMut};
use futures::{ready, Future, Stream};
use futures_core::{ready, Future, Stream};
use actix_http::cookie::Cookie;
use actix_http::error::{CookieParseError, PayloadError};

6
awc/src/sender.rs
View File

@ -7,7 +7,7 @@ use std::time::Duration;
use actix_rt::time::{delay_for, Delay};
use bytes::Bytes;
use derive_more::From;
use futures::{future::LocalBoxFuture, ready, Future, Stream};
use futures_core::{ready, Future, Stream};
use serde::Serialize;
use serde_json;
@ -49,7 +49,7 @@ impl Into<SendRequestError> for PrepForSendingError {
#[must_use = "futures do nothing unless polled"]
pub enum SendClientRequest {
Fut(
LocalBoxFuture<'static, Result<ClientResponse, SendRequestError>>,
Pin<Box<dyn Future<Output = Result<ClientResponse, SendRequestError>>>>,
Option<Delay>,
bool,
),
@ -58,7 +58,7 @@ pub enum SendClientRequest {
impl SendClientRequest {
pub(crate) fn new(
send: LocalBoxFuture<'static, Result<ClientResponse, SendRequestError>>,
send: Pin<Box<dyn Future<Output = Result<ClientResponse, SendRequestError>>>>,
response_decompress: bool,
timeout: Option<Duration>,
) -> SendClientRequest {