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

various cleanups

Browse Source
This commit is contained in:
Nikolay Kim
2017-12-13 11:10:03 -08:00
parent 55204c829c
commit d4187f682b
14 changed files with 70 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/handler.rs
View File

@@ -50,7 +50,7 @@ impl<F, R, S> Handler<S> for F
pub struct Reply(ReplyItem);
pub(crate) enum ReplyItem {
Message(HttpResponse),
Message(Box<HttpResponse>),
Actor(Box<IoContext>),
Future(Box<Future<Item=HttpResponse, Error=Error>>),
}
@@ -76,7 +76,7 @@ impl Reply {
/// Send response
#[inline]
pub fn response<R: Into<HttpResponse>>(response: R) -> Reply {
Reply(ReplyItem::Message(response.into()))
Reply(ReplyItem::Message(Box::new(response.into())))
}
#[inline]
@@ -107,14 +107,14 @@ impl FromRequest for HttpResponse {
type Error = Error;
fn from_request(self, _: HttpRequest) -> Result<Reply, Error> {
Ok(Reply(ReplyItem::Message(self)))
Ok(Reply(ReplyItem::Message(Box::new(self))))
}
}
impl From<HttpResponse> for Reply {
fn from(resp: HttpResponse) -> Reply {
Reply(ReplyItem::Message(resp))
Reply(ReplyItem::Message(Box::new(resp)))
}
}
@@ -138,7 +138,7 @@ impl<E: Into<Error>> From<Result<Reply, E>> for Reply {
fn from(res: Result<Reply, E>) -> Self {
match res {
Ok(val) => val,
Err(err) => Reply(ReplyItem::Message(err.into().into())),
Err(err) => Reply(ReplyItem::Message(Box::new(err.into().into()))),
}
}
}