rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1067: Fix whitespace

This commit is contained in:
Jesper Steen Møller 2024-09-26 17:26:28 +02:00
parent 0f7c075bfe
commit 368288ef06
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/lib/src/request/from_request_headers.rs
View File

@ -11,16 +11,18 @@ macro_rules! typed_headers_from_request {
#[rocket::async_trait] #[rocket::async_trait]
impl<'r> FromRequest<'r> for $name { impl<'r> FromRequest<'r> for $name {
type Error = headers::Error; type Error = headers::Error;
async fn from_request(req: &'r Request<'_>) -> crate::request::Outcome<Self, Self::Error> { async fn from_request(req: &'r Request<'_>) ->
crate::request::Outcome<Self, Self::Error> {
req.headers().get($name::name().as_str()).next().or_forward(Status::NotFound) req.headers().get($name::name().as_str()).next().or_forward(Status::NotFound)
.and_then(|h| HHeaderValue::from_str(h).or_error(Status::BadRequest)) .and_then(|h| HHeaderValue::from_str(h).or_error(Status::BadRequest))
.map_error(|(s, _)| (s, headers::Error::invalid())) .map_error(|(s, _)| (s, headers::Error::invalid()))
.and_then(|h| $name::decode(&mut std::iter::once(&h)).or_forward(Status::BadRequest)) .and_then(|h| $name::decode(&mut std::iter::once(&h))
.or_forward(Status::BadRequest))
} }
} }
)*) )*)
} }
macro_rules! generic_typed_headers_from_request { macro_rules! generic_typed_headers_from_request {
($($name:ident<$bound:ident>),*) => ($( ($($name:ident<$bound:ident>),*) => ($(
pub use crate::http::$name; pub use crate::http::$name;
@ -29,15 +31,17 @@ macro_rules! generic_typed_headers_from_request {
impl<'r, T1: 'static + $bound> FromRequest<'r> for $name<T1> { impl<'r, T1: 'static + $bound> FromRequest<'r> for $name<T1> {
type Error = headers::Error; type Error = headers::Error;
async fn from_request(req: &'r Request<'_>) -> crate::request::Outcome<Self, Self::Error> { async fn from_request(req: &'r Request<'_>) -> crate::request::Outcome<Self, Self::Error> {
req.headers().get($name::<T1>::name().as_str()).next().or_forward(Status::NotFound) req.headers().get($name::<T1>::name().as_str()).next()
.or_forward(Status::NotFound)
.and_then(|h| HHeaderValue::from_str(h).or_error(Status::BadRequest)) .and_then(|h| HHeaderValue::from_str(h).or_error(Status::BadRequest))
.map_error(|(s, _)| (s, headers::Error::invalid())) .map_error(|(s, _)| (s, headers::Error::invalid()))
.and_then(|h| $name::decode(&mut std::iter::once(&h)).or_forward(Status::BadRequest)) .and_then(|h| $name::decode(&mut std::iter::once(&h))
.or_forward(Status::BadRequest))
} }
} }
)*) )*)
} }
// The following headers from 'headers' 0.4 are not imported, since they are // The following headers from 'headers' 0.4 are not imported, since they are
// provided by other Rocket features. // provided by other Rocket features.
@ -100,4 +104,3 @@ generic_typed_headers_from_request! {
Authorization<Credentials>, // Authorization header, defined in RFC7235 Authorization<Credentials>, // Authorization header, defined in RFC7235
ProxyAuthorization<Credentials> // Proxy-Authorization header, defined in RFC7235 ProxyAuthorization<Credentials> // Proxy-Authorization header, defined in RFC7235
} }