use block_in_place and undo the other accidental overwrite

Author: jasonyess

pointercrate-core-api/src/error.rs

@@ -6,8 +6,9 @@ use pointercrate_core::error::PointercrateError;
 use pointercrate_core::localization::{LocaleConfiguration, LANGUAGE};
 use pointercrate_core_pages::error::ErrorFragment;
 use pointercrate_core_pages::PageFragment;
-use rocket::futures;
 use rocket::outcome::Outcome;
+use rocket::tokio::runtime::Handle;
+use rocket::tokio::task::block_in_place;
 use rocket::{
     http::{MediaType, Status},
     response::Responder,
@@ -47,16 +48,18 @@ impl<'r> Responder<'r, 'static> for ErrorResponder {
             let language = preferences.get(LOCALE_COOKIE_NAME).ok_or(Status::InternalServerError)?;
             let lang_id = LocaleConfiguration::get().by_code(language);
 
-            let fragment = futures::executor::block_on(async {
-                LANGUAGE
-                    .scope(lang_id.language, async {
-                        PageFragment::from(ErrorFragment {
-                            status: self.error_code / 100,
-                            reason: status.reason_lossy().to_string(),
-                            message: self.message,
+            let fragment = block_in_place(move || {
+                Handle::current().block_on(async {
+                    LANGUAGE
+                        .scope(lang_id.language, async {
+                            PageFragment::from(ErrorFragment {
+                                status: self.error_code / 100,
+                                reason: status.reason_lossy().to_string(),
+                                message: self.message,
+                            })
                         })
-                    })
-                    .await
+                        .await
+                })
             });
 
             Response::build_from(Page::new(fragment).respond_to(request)?).status(status).ok()

pointercrate-core-api/src/response.rs

@@ -10,8 +10,9 @@ use pointercrate_core_pages::{
     head::{Head, HeadLike},
     PageConfiguration, PageFragment,
 };
+use rocket::tokio::runtime::Handle;
+use rocket::tokio::task::block_in_place;
 use rocket::{
-    futures,
     http::{ContentType, Header, Status},
     response::Responder,
     serde::json::Json,
@@ -42,20 +43,22 @@ impl<'r, 'o: 'r> Responder<'r, 'o> for Page {
         let language = preferences.get(LOCALE_COOKIE_NAME).ok_or(Status::InternalServerError)?;
         let lang_id = LocaleConfiguration::get().by_code(language);
 
-        let (page_config, nav_bar, footer) = futures::executor::block_on(async {
-            LANGUAGE
-                .scope(lang_id.language, async {
-                    let page_config = request
-                        .rocket()
-                        .state::<fn() -> PageConfiguration>()
-                        .ok_or(Status::InternalServerError)?();
-
-                    let nav_bar = page_config.nav_bar.render();
-                    let footer = page_config.footer.render();
-
-                    Ok((page_config, nav_bar, footer))
-                })
-                .await
+        let (page_config, nav_bar, footer) = block_in_place(move || {
+            Handle::current().block_on(async {
+                LANGUAGE
+                    .scope(lang_id.language, async {
+                        let page_config = request
+                            .rocket()
+                            .state::<fn() -> PageConfiguration>()
+                            .ok_or(Status::InternalServerError)?();
+
+                        let nav_bar = page_config.nav_bar.render();
+                        let footer = page_config.footer.render();
+
+                        Ok((page_config, nav_bar, footer))
+                    })
+                    .await
+            })
         })?;
 
         let fragment = self.0;