Revert "Update to latest rocket master"
This reverts commit a8b48f4a58
.
This commit is contained in:
parent
a8b48f4a58
commit
acd524db25
|
@ -24,7 +24,7 @@ impl rocket::route::Handler for FairingErrorRoute {
|
||||||
async fn handle<'r>(
|
async fn handle<'r>(
|
||||||
&self,
|
&self,
|
||||||
request: &'r Request<'_>,
|
request: &'r Request<'_>,
|
||||||
_: rocket::Data<'r>,
|
_: rocket::Data,
|
||||||
) -> rocket::route::Outcome<'r> {
|
) -> rocket::route::Outcome<'r> {
|
||||||
let status = request
|
let status = request
|
||||||
.param::<u16>(0)
|
.param::<u16>(0)
|
||||||
|
@ -116,7 +116,7 @@ impl rocket::fairing::Fairing for Cors {
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn on_request(&self, request: &mut Request<'_>, _: &mut rocket::Data<'_>) {
|
async fn on_request(&self, request: &mut Request<'_>, _: &mut rocket::Data) {
|
||||||
let result = match validate(self, request) {
|
let result = match validate(self, request) {
|
||||||
Ok(_) => CorsValidation::Success,
|
Ok(_) => CorsValidation::Success,
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
|
|
|
@ -2006,7 +2006,7 @@ impl rocket::route::Handler for CatchAllOptionsRouteHandler {
|
||||||
async fn handle<'r>(
|
async fn handle<'r>(
|
||||||
&self,
|
&self,
|
||||||
request: &'r Request<'_>,
|
request: &'r Request<'_>,
|
||||||
_: rocket::Data<'r>,
|
_: rocket::Data,
|
||||||
) -> rocket::route::Outcome<'r> {
|
) -> rocket::route::Outcome<'r> {
|
||||||
let guard: Guard<'_> = match request.guard().await {
|
let guard: Guard<'_> = match request.guard().await {
|
||||||
Outcome::Success(guard) => guard,
|
Outcome::Success(guard) => guard,
|
||||||
|
|
Loading…
Reference in New Issue