worker/background_job: Return BoxFuture to avoid lifetime issues

Author: Turbo87

crates/crates_io_worker/src/background_job.rs

@@ -4,10 +4,10 @@ use diesel::dsl::{exists, not};
 use diesel::sql_types::{Int2, Jsonb, Text};
 use diesel::{ExpressionMethods, IntoSql, OptionalExtension, QueryDsl};
 use diesel_async::{AsyncPgConnection, RunQueryDsl};
-use futures_util::future::BoxFuture;
 use futures_util::FutureExt;
-use serde::de::DeserializeOwned;
+use futures_util::future::BoxFuture;
 use serde::Serialize;
+use serde::de::DeserializeOwned;
 use serde_json::Value;
 use std::future::Future;
 use tracing::instrument;
@@ -61,12 +61,12 @@ pub trait BackgroundJob: Serialize + DeserializeOwned + Send + Sync + 'static {
     }
 }
 
-fn enqueue_deduplicated(
+fn enqueue_deduplicated<'a>(
     conn: &mut AsyncPgConnection,
-    job_type: &'static str,
+    job_type: &'a str,
     data: Value,
     priority: i16,
-) -> impl Future<Output = Result<Option<i64>, EnqueueError>> {
+) -> BoxFuture<'a, Result<Option<i64>, EnqueueError>> {
     let similar_jobs = background_jobs::table
         .select(background_jobs::id)
         .filter(background_jobs::job_type.eq(job_type))
@@ -92,15 +92,15 @@ fn enqueue_deduplicated(
         .returning(background_jobs::id)
         .get_result::<i64>(conn);
 
-    async move { Ok(future.await.optional()?) }
+    async move { Ok(future.await.optional()?) }.boxed()
 }
 
-fn enqueue_simple(
+fn enqueue_simple<'a>(
     conn: &mut AsyncPgConnection,
-    job_type: &'static str,
+    job_type: &'a str,
     data: Value,
     priority: i16,
-) -> impl Future<Output = Result<i64, EnqueueError>> {
+) -> BoxFuture<'a, Result<i64, EnqueueError>> {
     let future = diesel::insert_into(background_jobs::table)
         .values((
             background_jobs::job_type.eq(job_type),
@@ -110,5 +110,5 @@ fn enqueue_simple(
         .returning(background_jobs::id)
         .get_result(conn);
 
-    async move { Ok(future.await?) }
+    async move { Ok(future.await?) }.boxed()
 }