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

simplify into body calls

This commit is contained in:
Rob Ede 2021-11-30 23:21:55 +00:00
parent c3c59e40d1
commit 56bdb39215
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
4 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/responder.rs
View File

@ -105,12 +105,8 @@ where
fn respond_to(self, req: &HttpRequest) -> HttpResponse<Self::Body> { fn respond_to(self, req: &HttpRequest) -> HttpResponse<Self::Body> {
match self { match self {
Some(val) => val Some(val) => val.respond_to(req).map_into_left_body(),
.respond_to(req) None => HttpResponse::new(StatusCode::NOT_FOUND).map_into_right_body(),
.map_body(|_, body| EitherBody::left(body)),
None => HttpResponse::new(StatusCode::NOT_FOUND)
.map_body(|_, body| EitherBody::right(body)),
} }
} }
} }
@ -125,13 +121,8 @@ where
fn respond_to(self, req: &HttpRequest) -> HttpResponse<Self::Body> { fn respond_to(self, req: &HttpRequest) -> HttpResponse<Self::Body> {
match self { match self {
Ok(val) => val Ok(val) => val.respond_to(req).map_into_left_body(),
.respond_to(req) Err(err) => HttpResponse::from_error(err.into()).map_into_right_body(),
.map_body(|_, body| EitherBody::left(body)),
Err(err) => {
HttpResponse::from_error(err.into()).map_body(|_, body| EitherBody::right(body))
}
} }
} }
} }
@ -278,7 +269,7 @@ where
res.headers_mut().insert(k, v); res.headers_mut().insert(k, v);
} }
res.map_body(|_, body| EitherBody::left(body)) res.map_into_left_body()
} }
} }

9
src/types/either.rs
View File

@ -152,13 +152,8 @@ where
fn respond_to(self, req: &HttpRequest) -> HttpResponse<Self::Body> { fn respond_to(self, req: &HttpRequest) -> HttpResponse<Self::Body> {
match self { match self {
Either::Left(a) => a Either::Left(a) => a.respond_to(req).map_into_left_body(),
.respond_to(req) Either::Right(b) => b.respond_to(req).map_into_right_body(),
.map_body(|_, body| body::EitherBody::left(body)),
Either::Right(b) => b
.respond_to(req)
.map_body(|_, body| body::EitherBody::right(body)),
} }
} }
} }

11
src/types/form.rs
View File

@ -189,14 +189,13 @@ impl<T: Serialize> Responder for Form<T> {
.content_type(mime::APPLICATION_WWW_FORM_URLENCODED) .content_type(mime::APPLICATION_WWW_FORM_URLENCODED)
.message_body(body) .message_body(body)
{ {
Ok(res) => res.map_body(|_, body| EitherBody::left(body)), Ok(res) => res.map_into_left_body(),
Err(err) => { Err(err) => HttpResponse::from_error(err).map_into_right_body(),
HttpResponse::from_error(err).map_body(|_, body| EitherBody::right(body))
}
}, },
Err(err) => HttpResponse::from_error(UrlencodedError::Serialize(err)) Err(err) => {
.map_body(|_, body| EitherBody::right(body)), HttpResponse::from_error(UrlencodedError::Serialize(err)).map_into_right_body()
}
} }
} }
} }

11
src/types/json.rs
View File

@ -125,14 +125,13 @@ impl<T: Serialize> Responder for Json<T> {
.content_type(mime::APPLICATION_JSON) .content_type(mime::APPLICATION_JSON)
.message_body(body) .message_body(body)
{ {
Ok(res) => res.map_body(|_, body| EitherBody::left(body)), Ok(res) => res.map_into_left_body(),
Err(err) => { Err(err) => HttpResponse::from_error(err).map_into_right_body(),
HttpResponse::from_error(err).map_body(|_, body| EitherBody::right(body))
}
}, },
Err(err) => HttpResponse::from_error(JsonPayloadError::Serialize(err)) Err(err) => {
.map_body(|_, body| EitherBody::right(body)), HttpResponse::from_error(JsonPayloadError::Serialize(err)).map_into_right_body()
}
} }
} }
} }