check passes

Author: syphar

src/build_queue.rs

@@ -271,7 +271,10 @@ impl BuildQueue {
                 should_reattempt: false,
                 successful: _,
             }) => {
-                transaction.execute("DELETE FROM queue WHERE id = $1;", &[&to_process.id])?;
+                self.runtime.block_on(
+                    sqlx::query!("DELETE FROM queue WHERE id = $1;", to_process.id)
+                        .execute(&mut *transaction),
+                )?;
             }
             Ok(BuildPackageSummary {
                 should_reattempt: true,

src/docbuilder/rustwide_builder.rs

@@ -17,7 +17,6 @@ use crate::{db::blacklist::is_blacklisted, utils::MetadataPackage};
 use crate::{AsyncStorage, Config, Context, InstanceMetrics, RegistryApi, Storage};
 use anyhow::{anyhow, bail, Context as _, Error};
 use docsrs_metadata::{BuildTargets, Metadata, DEFAULT_TARGETS, HOST_TARGET};
-use postgres::Client;
 use regex::Regex;
 use rustwide::cmd::{Command, CommandError, SandboxBuilder, SandboxImage};
 use rustwide::logging::{self, LogStorage};
@@ -336,7 +335,7 @@ impl RustwideBuilder {
                     set_config(&mut conn, ConfigName::RustcVersion, rustc_version).await
                 })?;
                 Ok(())
-            })
+            })?;
 
         krate.purge_from_cache(&self.workspace)?;
         Ok(())

src/web/builds.rs

@@ -133,7 +133,7 @@ pub(crate) async fn build_list_json_handler(
 }
 
 async fn crate_version_exists(
-    mut conn: DbConnection,
+    conn: &mut sqlx::PgConnection,
     name: &String,
     version: &Version,
 ) -> Result<bool, anyhow::Error> {
@@ -153,22 +153,19 @@ async fn crate_version_exists(
 }
 
 async fn build_trigger_check(
-    conn: DbConnection,
+    conn: &mut sqlx::PgConnection,
     name: &String,
     version: &Version,
     build_queue: &Arc<BuildQueue>,
 ) -> AxumResult<impl IntoResponse> {
-    if !crate_version_exists(conn, name, version).await? {
+    if !crate_version_exists(&mut *conn, name, version).await? {
         return Err(AxumNope::VersionNotFound);
     }
 
-    let crate_version_is_in_queue = spawn_blocking({
-        let name = name.clone();
-        let version_string = version.to_string();
-        let build_queue = build_queue.clone();
-        move || build_queue.has_build_queued(&name, &version_string)
-    })
-    .await?;
+    let crate_version_is_in_queue = build_queue
+        .has_build_queued(&mut *conn, &name, &version.to_string())
+        .await?;
+
     if crate_version_is_in_queue {
         return Err(AxumNope::BadRequest(anyhow!(
             "crate {name} {version} already queued for rebuild"
@@ -184,7 +181,7 @@ const TRIGGERED_REBUILD_PRIORITY: i32 = 5;
 
 pub(crate) async fn build_trigger_rebuild_handler(
     Path((name, version)): Path<(String, Version)>,
-    conn: DbConnection,
+    mut conn: DbConnection,
     Extension(build_queue): Extension<Arc<BuildQueue>>,
     Extension(config): Extension<Arc<Config>>,
     opt_auth_header: Option<TypedHeader<Authorization<Bearer>>>,
@@ -207,7 +204,7 @@ pub(crate) async fn build_trigger_rebuild_handler(
         )));
     }
 
-    build_trigger_check(conn, &name, &version, &build_queue)
+    build_trigger_check(&mut *conn, &name, &version, &build_queue)
         .await
         .map_err(JsonAxumNope)?;