berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

remove redundant messagebody bounds

This commit is contained in:
Rob Ede 2021-12-01 00:17:45 +00:00
parent 56bdb39215
commit 3dd8635ee4
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
21 changed files with 26 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.md
View File

@ -4,7 +4,7 @@
### Added
* Methods on `AcceptLanguage`: `ranked` and `preference`. [#2480]
* `AcceptEncoding` typed header. [#2482]
* `HttpResponse::map_into_boxed_body`. [#????]
* `HttpResponse::map_into_boxed_body`. [#2468]
### Changed
* Rename `Accept::{mime_precedence => ranked}`. [#2480]
@ -14,7 +14,7 @@
* Accept wildcard `*` items in `AcceptLanguage`. [#2480]
* Typed headers containing lists that require one or more items now enforce this minimum. [#2482]
[#????]: https://github.com/actix/actix-web/pull/????
[#2468]: https://github.com/actix/actix-web/pull/2468
[#2480]: https://github.com/actix/actix-web/pull/2480
[#2482]: https://github.com/actix/actix-web/pull/2482

18
actix-http/CHANGES.md
View File

@ -4,22 +4,20 @@
### Added
* Add timeout for canceling HTTP/2 server side connection handshake. Default to 5 seconds. [#2483]
* HTTP/2 handshake timeout can be configured with `ServiceConfig::client_timeout`. [#2483]
* Rename `body::BoxBody::{from_body => new}`. [#????]
* `Response::into_boxed_body`. [#????]
* `Response::map_into_boxed_body`. [#????]
* `body::EitherBody` enum. [#????]
* `body::None` struct. [#????]
* `impl Clone for ws::HandshakeError`. [#????]
* `Response::map_into_boxed_body`. [#2468]
* `body::EitherBody` enum. [#2468]
* `body::None` struct. [#2468]
* `impl Clone for ws::HandshakeError`. [#2468]
### Changed
* Rename `body::BoxBody::{from_body => new}`. [#????]
* Body type for `Responses` returned from `Response::{new, ok, etc...}` is now `BoxBody`. [#????]
* Rename `body::BoxBody::{from_body => new}`. [#2468]
* Body type for `Responses` returned from `Response::{new, ok, etc...}` is now `BoxBody`. [#2468]
### Removed
* Remove unnecessary `MessageBody` bound on types passed to `body::AnyBody::new`. [#????]
* Remove unnecessary `MessageBody` bound on types passed to `body::AnyBody::new`. [#2468]
[#2483]: https://github.com/actix/actix-web/pull/2483
[#????]: https://github.com/actix/actix-web/pull/????
[#2468]: https://github.com/actix/actix-web/pull/2468
## 3.0.0-beta.14 - 2021-11-30

3
actix-http/src/body/body.rs
View File

@ -48,7 +48,6 @@ impl AnyBody {
pub fn new_boxed<B>(body: B) -> Self
where
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError + 'static>>,
{
Self::Body {
body: BoxBody::new(body),
@ -83,7 +82,6 @@ impl<B> AnyBody<B> {
impl<B> AnyBody<B>
where
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError + 'static>>,
{
pub fn into_boxed(self) -> AnyBody {
match self {
@ -97,7 +95,6 @@ where
impl<B> MessageBody for AnyBody<B>
where
B: MessageBody,
B::Error: Into<Box<dyn StdError>> + 'static,
{
type Error = Error;

1
actix-http/src/body/boxed.rs
View File

@ -18,7 +18,6 @@ impl BoxBody {
pub fn new<B>(body: B) -> Self
where
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError + 'static>>,
{
let body = MessageBodyMapErr::new(body, Into::into);
Self(Box::pin(body))

3
actix-http/src/body/either.rs
View File

@ -1,5 +1,4 @@
use std::{
error::Error as StdError,
pin::Pin,
task::{Context, Poll},
};
@ -44,9 +43,7 @@ impl<L, R> EitherBody<L, R> {
impl<L, R> MessageBody for EitherBody<L, R>
where
L: MessageBody + 'static,
L::Error: Into<Box<dyn StdError + 'static>>,
R: MessageBody + 'static,
R::Error: Into<Box<dyn StdError + 'static>>,
{
type Error = Error;

4
actix-http/src/builder.rs
View File

@ -1,4 +1,4 @@
use std::{error::Error as StdError, fmt, marker::PhantomData, net, rc::Rc};
use std::{fmt, marker::PhantomData, net, rc::Rc};
use actix_codec::Framed;
use actix_service::{IntoServiceFactory, Service, ServiceFactory};
@ -205,7 +205,6 @@ where
S::Response: Into<Response<B>> + 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
{
let cfg = ServiceConfig::new(
self.keep_alive,
@ -228,7 +227,6 @@ where
S::Response: Into<Response<B>> + 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
{
let cfg = ServiceConfig::new(
self.keep_alive,

9
actix-http/src/h1/dispatcher.rs
View File

@ -1,6 +1,5 @@
use std::{
collections::VecDeque,
error::Error as StdError,
fmt,
future::Future,
io, mem, net,
@ -54,7 +53,6 @@ where
S::Error: Into<Response<BoxBody>>,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
X: Service<Request, Response = Request>,
X::Error: Into<Response<BoxBody>>,
@ -76,7 +74,6 @@ where
S::Error: Into<Response<BoxBody>>,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
X: Service<Request, Response = Request>,
X::Error: Into<Response<BoxBody>>,
@ -95,7 +92,6 @@ where
S::Error: Into<Response<BoxBody>>,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
X: Service<Request, Response = Request>,
X::Error: Into<Response<BoxBody>>,
@ -137,7 +133,6 @@ where
X: Service<Request, Response = Request>,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
{
None,
ExpectCall(#[pin] X::Future),
@ -153,7 +148,6 @@ where
X: Service<Request, Response = Request>,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
{
fn is_empty(&self) -> bool {
matches!(self, State::None)
@ -175,7 +169,6 @@ where
S::Response: Into<Response<B>>,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
X: Service<Request, Response = Request>,
X::Error: Into<Response<BoxBody>>,
@ -236,7 +229,6 @@ where
S::Response: Into<Response<B>>,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
X: Service<Request, Response = Request>,
X::Error: Into<Response<BoxBody>>,
@ -913,7 +905,6 @@ where
S::Response: Into<Response<B>>,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
X: Service<Request, Response = Request>,
X::Error: Into<Response<BoxBody>>,

6
actix-http/src/h1/service.rs
View File

@ -1,5 +1,4 @@
use std::{
error::Error as StdError,
fmt,
marker::PhantomData,
net,
@ -68,7 +67,6 @@ where
S::Response: Into<Response<B>>,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
X: ServiceFactory<Request, Config = (), Response = Request>,
X::Future: 'static,
@ -119,7 +117,6 @@ mod openssl {
S::Response: Into<Response<B>>,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
X: ServiceFactory<Request, Config = (), Response = Request>,
X::Future: 'static,
@ -182,7 +179,6 @@ mod rustls {
S::Response: Into<Response<B>>,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
X: ServiceFactory<Request, Config = (), Response = Request>,
X::Future: 'static,
@ -282,7 +278,6 @@ where
S::InitError: fmt::Debug,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
X: ServiceFactory<Request, Config = (), Response = Request>,
X::Future: 'static,
@ -351,7 +346,6 @@ where
S::Response: Into<Response<B>>,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
X: Service<Request, Response = Request>,
X::Error: Into<Response<BoxBody>>,

2
actix-http/src/h2/dispatcher.rs
View File

@ -97,7 +97,6 @@ where
S::Response: Into<Response<B>>,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
{
type Output = Result<(), crate::error::DispatchError>;
@ -207,7 +206,6 @@ async fn handle_response<B>(
) -> Result<(), DispatchError>
where
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
{
let (res, body) = res.replace_body(());

8
actix-http/src/h2/service.rs
View File

@ -1,5 +1,4 @@
use std::{
error::Error as StdError,
future::Future,
marker::PhantomData,
net,
@ -44,7 +43,6 @@ where
<S::Service as Service<Request>>::Future: 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
{
/// Create new `H2Service` instance with config.
pub(crate) fn with_config<F: IntoServiceFactory<S, Request>>(
@ -75,7 +73,6 @@ where
<S::Service as Service<Request>>::Future: 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
{
/// Create plain TCP based service
pub fn tcp(
@ -119,7 +116,6 @@ mod openssl {
<S::Service as Service<Request>>::Future: 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
{
/// Create OpenSSL based service.
pub fn openssl(
@ -167,7 +163,6 @@ mod rustls {
<S::Service as Service<Request>>::Future: 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
{
/// Create Rustls based service.
pub fn rustls(
@ -209,7 +204,6 @@ where
<S::Service as Service<Request>>::Future: 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
{
type Response = ();
type Error = DispatchError;
@ -271,7 +265,6 @@ where
S::Future: 'static,
S::Response: Into<Response<B>> + 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
{
type Response = ();
type Error = DispatchError;
@ -336,7 +329,6 @@ where
S::Future: 'static,
S::Response: Into<Response<B>> + 'static,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
{
type Output = Result<(), DispatchError>;

2
actix-http/src/response.rs
View File

@ -2,7 +2,6 @@
use std::{
cell::{Ref, RefMut},
error::Error as StdError,
fmt, str,
};
@ -194,7 +193,6 @@ impl<B> Response<B> {
pub fn map_into_boxed_body(self) -> Response<BoxBody>
where
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError + 'static>>,
{
self.map_body(|_, body| BoxBody::new(body))
}

2
actix-http/src/response_builder.rs
View File

@ -2,7 +2,6 @@
use std::{
cell::{Ref, RefMut},
error::Error as StdError,
fmt,
future::Future,
pin::Pin,
@ -235,7 +234,6 @@ impl ResponseBuilder {
pub fn body<B>(&mut self, body: B) -> Response<EitherBody<B>>
where
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError + 'static>>,
{
match self.message_body(body) {
Ok(res) => res.map_body(|_, body| EitherBody::left(body)),

10
actix-http/src/service.rs
View File

@ -1,5 +1,4 @@
use std::{
error::Error as StdError,
fmt,
future::Future,
marker::PhantomData,
@ -58,7 +57,6 @@ where
S::Response: Into<Response<B>> + 'static,
<S::Service as Service<Request>>::Future: 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
{
/// Create new `HttpService` instance.
pub fn new<F: IntoServiceFactory<S, Request>>(service: F) -> Self {
@ -157,7 +155,6 @@ where
<S::Service as Service<Request>>::Future: 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
X: ServiceFactory<Request, Config = (), Response = Request>,
X::Future: 'static,
@ -214,7 +211,6 @@ mod openssl {
<S::Service as Service<Request>>::Future: 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
X: ServiceFactory<Request, Config = (), Response = Request>,
X::Future: 'static,
@ -287,7 +283,6 @@ mod rustls {
<S::Service as Service<Request>>::Future: 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
X: ServiceFactory<Request, Config = (), Response = Request>,
X::Future: 'static,
@ -354,7 +349,6 @@ where
<S::Service as Service<Request>>::Future: 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
X: ServiceFactory<Request, Config = (), Response = Request>,
X::Future: 'static,
@ -491,7 +485,6 @@ where
S::Response: Into<Response<B>> + 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
X: Service<Request, Response = Request>,
X::Error: Into<Response<BoxBody>>,
@ -560,7 +553,6 @@ pin_project! {
S::Error: Into<Response<BoxBody>>,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
X: Service<Request, Response = Request>,
X::Error: Into<Response<BoxBody>>,
@ -597,7 +589,6 @@ pin_project! {
S::Response: 'static,
B: MessageBody,
B::Error: Into<Box<dyn StdError>>,
X: Service<Request, Response = Request>,
X::Error: Into<Response<BoxBody>>,
@ -620,7 +611,6 @@ where
S::Response: Into<Response<B>> + 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
X: Service<Request, Response = Request>,
X::Error: Into<Response<BoxBody>>,

4
actix-test/src/lib.rs
View File

@ -31,7 +31,7 @@ extern crate tls_openssl as openssl;
#[cfg(feature = "rustls")]
extern crate tls_rustls as rustls;
use std::{error::Error as StdError, fmt, net, thread, time::Duration};
use std::{fmt, net, thread, time::Duration};
use actix_codec::{AsyncRead, AsyncWrite, Framed};
pub use actix_http::test::TestBuffer;
@ -88,7 +88,6 @@ where
S::Response: Into<Response<B>> + 'static,
<S::Service as Service<Request>>::Future: 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
{
start_with(TestServerConfig::default(), factory)
}
@ -128,7 +127,6 @@ where
S::Response: Into<Response<B>> + 'static,
<S::Service as Service<Request>>::Future: 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
{
// for sending handles and server info back from the spawned thread
let (started_tx, started_rx) = std::sync::mpsc::channel();

17
benches/responder.rs
View File

@ -1,9 +1,10 @@
use std::{future::Future, time::Instant};
use actix_http::body::BoxBody;
use actix_utils::future::{ready, Ready};
use actix_web::http::StatusCode;
use actix_web::test::TestRequest;
use actix_web::{error, Error, HttpRequest, HttpResponse, Responder};
use actix_web::{
error, http::StatusCode, test::TestRequest, Error, HttpRequest, HttpResponse, Responder,
};
use criterion::{criterion_group, criterion_main, Criterion};
use futures_util::future::{join_all, Either};
@ -50,7 +51,9 @@ where
}
impl Responder for StringResponder {
fn respond_to(self, _: &HttpRequest) -> HttpResponse {
type Body = BoxBody;
fn respond_to(self, _: &HttpRequest) -> HttpResponse<Self::Body> {
HttpResponse::build(StatusCode::OK)
.content_type("text/plain; charset=utf-8")
.body(self.0)
@ -58,9 +61,11 @@ impl Responder for StringResponder {
}
impl<T: Responder> Responder for OptionResponder<T> {
fn respond_to(self, req: &HttpRequest) -> HttpResponse {
type Body = BoxBody;
fn respond_to(self, req: &HttpRequest) -> HttpResponse<Self::Body> {
match self.0 {
Some(t) => t.respond_to(req),
Some(t) => t.respond_to(req).map_into_boxed_body(),
None => HttpResponse::from_error(error::ErrorInternalServerError("err")),
}
}

2
src/middleware/compat.rs
View File

@ -1,7 +1,6 @@
//! For middleware documentation, see [`Compat`].
use std::{
error::Error as StdError,
future::Future,
pin::Pin,
task::{Context, Poll},
@ -123,7 +122,6 @@ pub trait MapServiceResponseBody {
impl<B> MapServiceResponseBody for ServiceResponse<B>
where
B: MessageBody + Unpin + 'static,
B::Error: Into<Box<dyn StdError + 'static>>,
{
fn map_body(self) -> ServiceResponse {
self.map_into_boxed_body()

1
src/response/builder.rs
View File

@ -312,7 +312,6 @@ impl HttpResponseBuilder {
pub fn body<B>(&mut self, body: B) -> HttpResponse<BoxBody>
where
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError + 'static>>,
{
match self.message_body(body) {
Ok(res) => res.map_into_boxed_body(),

2
src/response/response.rs
View File

@ -1,6 +1,5 @@
use std::{
cell::{Ref, RefMut},
error::Error as StdError,
fmt,
future::Future,
mem,
@ -241,7 +240,6 @@ impl<B> HttpResponse<B> {
pub fn map_into_boxed_body(self) -> HttpResponse<BoxBody>
where
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError + 'static>>,
{
self.map_body(|_, body| BoxBody::new(body))
}

8
src/server.rs
View File

@ -1,8 +1,6 @@
use std::{
any::Any,
cmp,
error::Error as StdError,
fmt, io,
cmp, fmt, io,
marker::PhantomData,
net,
sync::{Arc, Mutex},
@ -75,15 +73,13 @@ where
I: IntoServiceFactory<S, Request>,
S: ServiceFactory<Request, Config = AppConfig> + 'static,
// S::Future: 'static,
S::Error: Into<Error> + 'static,
S::InitError: fmt::Debug,
S::Response: Into<Response<B>> + 'static,
<S::Service as Service<Request>>::Future: 'static,
S::Service: 'static,
// S::Service: 'static,
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError>>,
{
/// Create new HTTP server with application factory
pub fn new(factory: F) -> Self {

2
src/service.rs
View File

@ -1,6 +1,5 @@
use std::{
cell::{Ref, RefMut},
error::Error as StdError,
fmt, net,
rc::Rc,
};
@ -426,7 +425,6 @@ impl<B> ServiceResponse<B> {
pub fn map_into_boxed_body(self) -> ServiceResponse<BoxBody>
where
B: MessageBody + 'static,
B::Error: Into<Box<dyn StdError + 'static>>,
{
self.map_body(|_, body| BoxBody::new(body))
}

4
src/types/either.rs
View File

@ -14,7 +14,7 @@ use pin_project_lite::pin_project;
use crate::{
body, dev,
web::{Form, Json},
BoxError, Error, FromRequest, HttpRequest, HttpResponse, Responder,
Error, FromRequest, HttpRequest, HttpResponse, Responder,
};
/// Combines two extractor or responder types into a single type.
@ -144,9 +144,7 @@ impl<L, R> Either<L, R> {
impl<L, R> Responder for Either<L, R>
where
L: Responder,
<L::Body as dev::MessageBody>::Error: Into<BoxError>,
R: Responder,
<R::Body as dev::MessageBody>::Error: Into<BoxError>,
{
type Body = body::EitherBody<L::Body, R::Body>;