rwf2/Rocket
1
0
Fork 0
mirror of https://github.com/rwf2/Rocket.git synced 2025-02-06 08:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary boxing of some Futures.

Browse Source
This commit is contained in:
Jacob Pratt 2019-09-06 12:56:06 -04:00 committed by Sergio Benitez
parent 1f90a9b6d1
commit bd929ef617
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/lib/src/catcher.rs
View File

@ -155,11 +155,9 @@ macro_rules! default_catchers {
$( $(
fn $fn_name<'r>(req: &'r Request<'_>) -> std::pin::Pin<Box<dyn std::future::Future<Output = response::Result<'r>> + Send + 'r>> { fn $fn_name<'r>(req: &'r Request<'_>) -> std::pin::Pin<Box<dyn std::future::Future<Output = response::Result<'r>> + Send + 'r>> {
(async move { status::Custom(Status::from_code($code).unwrap(),
status::Custom(Status::from_code($code).unwrap(), content::Html(error_page_template!($code, $name, $description))
content::Html(error_page_template!($code, $name, $description)) ).respond_to(req)
).respond_to(req).await
}).boxed()
} }
map.insert($code, Catcher::new_default($code, $fn_name)); map.insert($code, Catcher::new_default($code, $fn_name));
@ -171,7 +169,6 @@ macro_rules! default_catchers {
pub mod defaults { pub mod defaults {
use super::Catcher; use super::Catcher;
use futures::future::FutureExt;
use std::collections::HashMap; use std::collections::HashMap;

27
core/lib/src/response/responder.rs
View File

@ -2,6 +2,7 @@ use std::fs::File;
use std::io::Cursor; use std::io::Cursor;
use futures::io::BufReader; use futures::io::BufReader;
use futures::future;
use crate::http::{Status, ContentType, StatusClass}; use crate::http::{Status, ContentType, StatusClass};
use crate::response::{self, Response, Body}; use crate::response::{self, Response, Body};
@ -278,15 +279,13 @@ impl Responder<'_> for () {
/// a warning message and returns an `Err` of `Status::NotFound`. /// a warning message and returns an `Err` of `Status::NotFound`.
impl<'r, R: Responder<'r> + Send + 'r> Responder<'r> for Option<R> { impl<'r, R: Responder<'r> + Send + 'r> Responder<'r> for Option<R> {
fn respond_to(self, req: &'r Request<'_>) -> response::ResultFuture<'r> { fn respond_to(self, req: &'r Request<'_>) -> response::ResultFuture<'r> {
Box::pin(async move { match self {
match self { Some(r) => r.respond_to(req),
Some(r) => r.respond_to(req).await, None => {
None => { warn_!("Response was `None`.");
warn_!("Response was `None`."); Box::pin(future::err(Status::NotFound))
Err(Status::NotFound) },
}, }
}
})
} }
} }
@ -294,12 +293,10 @@ impl<'r, R: Responder<'r> + Send + 'r> Responder<'r> for Option<R> {
/// `Err`. /// `Err`.
impl<'r, R: Responder<'r> + Send + 'r, E: Responder<'r> + Send + 'r> Responder<'r> for Result<R, E> { impl<'r, R: Responder<'r> + Send + 'r, E: Responder<'r> + Send + 'r> Responder<'r> for Result<R, E> {
fn respond_to(self, req: &'r Request<'_>) -> response::ResultFuture<'r> { fn respond_to(self, req: &'r Request<'_>) -> response::ResultFuture<'r> {
Box::pin(async move { match self {
match self { Ok(responder) => responder.respond_to(req),
Ok(responder) => responder.respond_to(req).await, Err(responder) => responder.respond_to(req),
Err(responder) => responder.respond_to(req).await, }
}
})
} }
} }