selfhosted
/
filite
mirror of https://github.com/raftario/filite.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use from_err instead of into in select handler creation macro

This commit is contained in:
Raphaël Thériault 2019-10-21 14:18:49 -04:00
parent 65b5f1d6bf
commit 26c73bc9f2
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/routes.rs
View File

@ -55,14 +55,12 @@ macro_rules! select {
pool: actix_web::web::Data<Pool>,
) -> impl futures::Future<Item = actix_web::HttpResponse, Error = actix_web::Error> {
let filters = crate::queries::SelectFilters::from(query.into_inner());
actix_web::web::block(move || crate::queries::$m::select(filters, pool)).then(
|result| match result {
actix_web::web::block(move || crate::queries::$m::select(filters, pool))
.then(|result| match result {
Ok(x) => Ok(actix_web::HttpResponse::Ok().json(x)),
Err(_) => Err(actix_web::HttpResponse::InternalServerError()
.finish()
.into()),
},
)
Err(_) => Err(actix_web::HttpResponse::InternalServerError().finish()),
})
.from_err()
}
};
}