Store full '&Rocket' in '&Request'.

This is instead of storing pieces of the active Rocket instance.

core/lib/src/config/secret_key.rs

@@ -186,7 +186,7 @@ impl<'r> FromRequest<'r> for &'r SecretKey {
     type Error = std::convert::Infallible;
 
     async fn from_request(req: &'r Request<'_>) -> Outcome<Self, Self::Error> {
-        Outcome::Success(&req.state.config.secret_key)
+        Outcome::Success(&req.config().secret_key)
     }
 }
 

core/lib/src/local/asynchronous/response.rs

@@ -88,7 +88,7 @@ impl<'c> LocalResponse<'c> {
 
         async move {
             let response: Response<'c> = f(request).await;
-            let mut cookies = CookieJar::new(&request.state.config);
+            let mut cookies = CookieJar::new(request.config());
             for cookie in response.cookies() {
                 cookies.add_original(cookie.into_owned());
             }

core/lib/src/request/request.rs

@@ -13,7 +13,7 @@ use atomic::{Atomic, Ordering};
 use crate::request::{FromParam, FromSegments, FromRequest, Outcome};
 use crate::form::{self, ValueField, FromForm};
 
-use crate::{Rocket, Config, Shutdown, Route};
+use crate::{Rocket, Config, Route};
 use crate::http::{hyper, uri::{Origin, Segments}, uncased::UncasedStr};
 use crate::http::{Method, Header, HeaderMap};
 use crate::http::{ContentType, Accept, MediaType, CookieJar, Cookie};
@@ -34,9 +34,7 @@ pub struct Request<'r> {
 }
 
 pub(crate) struct RequestState<'r> {
-    pub config: &'r Config,
+    pub rocket: &'r Rocket,
-    pub managed: &'r Container![Send + Sync],
-    pub shutdown: &'r Shutdown,
     pub route: Atomic<Option<&'r Route>>,
     pub cookies: CookieJar<'r>,
     pub accept: Storage<Option<Accept>>,
@@ -59,9 +57,7 @@ impl Request<'_> {
 impl RequestState<'_> {
     fn clone(&self) -> Self {
         RequestState {
-            config: self.config,
+            rocket: self.rocket,
-            managed: self.managed,
-            shutdown: self.shutdown,
             route: Atomic::new(self.route.load(Ordering::Acquire)),
             cookies: self.cookies.clone(),
             accept: self.accept.clone(),
@@ -85,9 +81,7 @@ impl<'r> Request<'r> {
             headers: HeaderMap::new(),
             remote: None,
             state: RequestState {
-                config: &rocket.config,
+                rocket,
-                managed: &rocket.managed_state,
-                shutdown: &rocket.shutdown_handle,
                 route: Atomic::new(None),
                 cookies: CookieJar::new(&rocket.config),
                 accept: Storage::new(),
@@ -477,7 +471,7 @@ impl<'r> Request<'r> {
     /// let config = request.config();
     /// ```
     pub fn config(&self) -> &'r Config {
-        &self.state.config
+        &self.state.rocket.config
     }
 
     /// Returns the configured application data limits.
@@ -496,7 +490,7 @@ impl<'r> Request<'r> {
     /// assert_eq!(request.limits().get("file/pdf"), Some(1.mebibytes()));
     /// ```
     pub fn limits(&self) -> &'r Limits {
-        &self.state.config.limits
+        &self.config().limits
     }
 
     /// Get the presently matched route, if any.
@@ -550,7 +544,7 @@ impl<'r> Request<'r> {
     pub fn managed_state<T>(&self) -> Option<&'r T>
         where T: Send + Sync + 'static
     {
-        self.state.managed.try_get::<T>()
+        self.state.rocket.state::<T>()
     }
 
     /// Retrieves the cached value for type `T` from the request-local cached

core/lib/src/shutdown.rs

@@ -55,6 +55,6 @@ impl<'r> FromRequest<'r> for Shutdown {
 
     #[inline]
     async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> {
-        Outcome::Success(request.state.shutdown.clone())
+        Outcome::Success(request.state.rocket.shutdown())
     }
 }

core/lib/src/state.rs

@@ -174,10 +174,10 @@ impl<'r, T: Send + Sync + 'static> FromRequest<'r> for State<'r, T> {
 
     #[inline(always)]
     async fn from_request(req: &'r Request<'_>) -> request::Outcome<Self, ()> {
-        match req.state.managed.try_get::<T>() {
+        match req.managed_state::<T>() {
             Some(state) => Outcome::Success(State(state)),
             None => {
-                error_!("Attempted to retrieve unmanaged state!");
+                error_!("Attempted to retrieve unmanaged state `{}`!", std::any::type_name::<T>());
                 Outcome::Failure((Status::InternalServerError, ()))
             }
         }