actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-06-25 09:59:21 +02:00
Code Issues Releases Wiki Activity

impl Default trait for HttpRequest

Browse Source
This commit is contained in:
Nikolay Kim
2017-11-26 22:20:28 -08:00
parent b62b303fdb
commit 45433f71e5
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/httprequest.rs
View File

@ -75,13 +75,8 @@ impl HttpRequest<()> {
)
}
/// Construct request for error response.
pub(crate) fn for_error() -> HttpRequest {
HttpRequest(Rc::new(HttpMessage::default()), Rc::new(()))
}
/// Construct new http request with state.
pub(crate) fn with_state<S>(self, state: Rc<S>) -> HttpRequest<S> {
pub fn with_state<S>(self, state: Rc<S>) -> HttpRequest<S> {
HttpRequest(self.0, state)
}
}
@ -345,6 +340,14 @@ impl<S> HttpRequest<S> {
}
}
impl Default for HttpRequest<()> {
/// Construct default request
fn default() -> HttpRequest {
HttpRequest(Rc::new(HttpMessage::default()), Rc::new(()))
}
}
impl<S> Clone for HttpRequest<S> {
fn clone(&self) -> HttpRequest<S> {
HttpRequest(Rc::clone(&self.0), Rc::clone(&self.1))

6
src/pipeline.rs
View File

@ -39,13 +39,13 @@ impl Pipeline {
Pipeline(PipelineState::Starting(res)),
Err(err) =>
Pipeline(PipelineState::Error(
Box::new((Task::reply(err), HttpRequest::for_error()))))
Box::new((Task::reply(err), HttpRequest::default()))))
}
}
}
pub fn error<R: Into<HttpResponse>>(resp: R) -> Self {
Pipeline(PipelineState::Error(Box::new((Task::reply(resp), HttpRequest::for_error()))))
Pipeline(PipelineState::Error(Box::new((Task::reply(resp), HttpRequest::default()))))
}
pub(crate) fn disconnected(&mut self) {
@ -79,7 +79,7 @@ impl Pipeline {
self.0 = PipelineState::Handle(h),
Err(err) =>
self.0 = PipelineState::Error(
Box::new((Task::reply(err), HttpRequest::for_error())))
Box::new((Task::reply(err), HttpRequest::default())))
}
}
PipelineState::Handle(mut st) => {