actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-01-18 05:41:50 +01:00
Code Issues Releases Wiki Activity

cleanup more examples

Browse Source
This commit is contained in:
Nikolay Kim 2017-12-20 21:06:04 -08:00
parent 406d2c41e9
commit 0a68811dce
4 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/diesel/src/main.rs
View File

@ -37,15 +37,15 @@ struct State {
fn index(req: HttpRequest<State>) -> Box<Future<Item=HttpResponse, Error=Error>> { fn index(req: HttpRequest<State>) -> Box<Future<Item=HttpResponse, Error=Error>> {
let name = &req.match_info()["name"]; let name = &req.match_info()["name"];
Box::new( req.state().db.call_fut(CreateUser{name: name.to_owned()})
req.state().db.call_fut(CreateUser{name: name.to_owned()}) .from_err()
.from_err() .and_then(|res| {
.and_then(|res| { match res {
match res { Ok(user) => Ok(httpcodes::HTTPOk.build().json(user)?),
Ok(user) => Ok(httpcodes::HTTPOk.build().json(user)?), Err(_) => Ok(httpcodes::HTTPInternalServerError.response())
Err(_) => Ok(httpcodes::HTTPInternalServerError.response()) }
} })
})) .responder()
} }
fn main() { fn main() {

20
guide/src/qs_14.md
View File

@ -107,16 +107,16 @@ used for async handler registration.
fn index(req: HttpRequest<State>) -> Box<Future<Item=HttpResponse, Error=Error>> { fn index(req: HttpRequest<State>) -> Box<Future<Item=HttpResponse, Error=Error>> {
let name = &req.match_info()["name"]; let name = &req.match_info()["name"];
Box::new( // Send message to `DbExecutor` actor
// Send message to `DbExecutor` actor req.state().db.call_fut(CreateUser{name: name.to_owned()})
req.state().db.call_fut(CreateUser{name: name.to_owned()}) .from_err()
.and_then(|res| { .and_then(|res| {
match res { match res {
Ok(user) => ok(HTTPOk.build().json(user)), Ok(user) => Ok(httpcodes::HTTPOk.build().json(user)?),
Err(_) => ok(HTTPInternalServerError.response()) Err(_) => Ok(httpcodes::HTTPInternalServerError.response())
} }
}) })
.map_err(|e| error::ErrorInternalServerError(e).into())) .responder()
} }
``` ```

33
guide/src/qs_7.md
View File

@ -234,14 +234,13 @@ use actix_web::*;
use futures::future::{Future, ok}; use futures::future::{Future, ok};
fn index(mut req: HttpRequest) -> Box<Future<Item=HttpResponse, Error=Error>> { fn index(mut req: HttpRequest) -> Box<Future<Item=HttpResponse, Error=Error>> {
Box::new( req.urlencoded() // <- get UrlEncoded future
req.urlencoded() // <- get UrlEncoded future .from_err()
.and_then(|params| { // <- url encoded parameters .and_then(|params| { // <- url encoded parameters
println!("==== BODY ==== {:?}", params); println!("==== BODY ==== {:?}", params);
ok(httpcodes::HTTPOk.response()) ok(httpcodes::HTTPOk.response())
}) })
.map_err(Error::from) .responder()
)
} }
# fn main() {} # fn main() {}
``` ```
@ -276,15 +275,15 @@ use futures::{Future, Stream};
fn index(mut req: HttpRequest) -> Box<Future<Item=HttpResponse, Error=Error>> { fn index(mut req: HttpRequest) -> Box<Future<Item=HttpResponse, Error=Error>> {
Box::new( req.payload_mut()
req.payload_mut() .readany()
.readany() .from_err()
.fold((), |_, chunk| { .fold((), |_, chunk| {
println!("Chunk: {:?}", chunk); println!("Chunk: {:?}", chunk);
result::<_, error::PayloadError>(Ok(())) result::<_, error::PayloadError>(Ok(()))
}) })
.map_err(|e| Error::from(e)) .map(|_| HttpResponse::Ok().finish().unwrap())
.map(|_| HttpResponse::Ok().finish().unwrap())) .responder()
} }
# fn main() {} # fn main() {}
``` ```

15
src/httprequest.rs
View File

@ -456,14 +456,13 @@ impl<S> HttpRequest<S> {
/// use futures::future::{Future, ok}; /// use futures::future::{Future, ok};
/// ///
/// fn index(mut req: HttpRequest) -> Box<Future<Item=HttpResponse, Error=Error>> { /// fn index(mut req: HttpRequest) -> Box<Future<Item=HttpResponse, Error=Error>> {
/// Box::new( /// req.urlencoded() // <- get UrlEncoded future
/// req.urlencoded() // <- get UrlEncoded future /// .from_err()
/// .and_then(|params| { // <- url encoded parameters /// .and_then(|params| { // <- url encoded parameters
/// println!("==== BODY ==== {:?}", params); /// println!("==== BODY ==== {:?}", params);
/// ok(httpcodes::HTTPOk.response()) /// ok(httpcodes::HTTPOk.response())
/// }) /// })
/// .map_err(Error::from) /// .responder()
/// )
/// } /// }
/// # fn main() {} /// # fn main() {}
/// ``` /// ```