From acd524db2594b6117160d78983941bc52db69a28 Mon Sep 17 00:00:00 2001 From: projectmoon Date: Wed, 9 Jun 2021 14:55:49 +0000 Subject: [PATCH] Revert "Update to latest rocket master" This reverts commit a8b48f4a5846e86360b10d701956c3228de57a7e. --- src/fairing.rs | 4 ++-- src/lib.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fairing.rs b/src/fairing.rs index b88740b..c2bd628 100644 --- a/src/fairing.rs +++ b/src/fairing.rs @@ -24,7 +24,7 @@ impl rocket::route::Handler for FairingErrorRoute { async fn handle<'r>( &self, request: &'r Request<'_>, - _: rocket::Data<'r>, + _: rocket::Data, ) -> rocket::route::Outcome<'r> { let status = request .param::(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) { Ok(_) => CorsValidation::Success, Err(err) => { diff --git a/src/lib.rs b/src/lib.rs index 6214913..7b20e86 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2006,7 +2006,7 @@ impl rocket::route::Handler for CatchAllOptionsRouteHandler { async fn handle<'r>( &self, request: &'r Request<'_>, - _: rocket::Data<'r>, + _: rocket::Data, ) -> rocket::route::Outcome<'r> { let guard: Guard<'_> = match request.guard().await { Outcome::Success(guard) => guard,