fix clippy

Author: syphar

src/db/delete.rs

@@ -215,7 +215,7 @@ async fn delete_crate_from_database(
 mod tests {
     use super::*;
     use crate::registry_api::{CrateOwner, OwnerKind};
-    use crate::test::{async_wrapper, fake_release_that_failed_before_build, wrapper};
+    use crate::test::{async_wrapper, fake_release_that_failed_before_build};
     use test_case::test_case;
 
     async fn crate_exists(conn: &mut sqlx::PgConnection, name: &str) -> Result<bool> {
@@ -486,44 +486,43 @@ mod tests {
 
     #[test]
     fn test_delete_incomplete_version() {
-        wrapper(|env| {
-            let db = env.db();
-
-            let (release_id, _) = env
-                .runtime()
-                .block_on(async {
-                    let mut conn = db.async_conn().await;
-                    fake_release_that_failed_before_build(&mut conn, "a", "1.0.0", "some-error")
-                        .await
-                })
-                .unwrap();
+        async_wrapper(|env| async move {
+            let db = env.async_db().await;
+            let mut conn = db.async_conn().await;
+
+            let (release_id, _) =
+                fake_release_that_failed_before_build(&mut conn, "a", "1.0.0", "some-error")
+                    .await?;
 
-            delete_version(&mut db.conn(), &env.storage(), &env.config(), "a", "1.0.0")?;
+            delete_version(
+                &mut conn,
+                &*env.async_storage().await,
+                &env.config(),
+                "a",
+                "1.0.0",
+            )
+            .await?;
 
-            assert!(!release_exists(&mut db.conn(), release_id)?);
+            assert!(!release_exists(&mut conn, release_id).await?);
 
             Ok(())
         })
     }
 
     #[test]
     fn test_delete_incomplete_crate() {
-        wrapper(|env| {
-            let db = env.db();
-
-            let (release_id, _) = env
-                .runtime()
-                .block_on(async {
-                    let mut conn = db.async_conn().await;
-                    fake_release_that_failed_before_build(&mut conn, "a", "1.0.0", "some-error")
-                        .await
-                })
-                .unwrap();
+        async_wrapper(|env| async move {
+            let db = env.async_db().await;
+            let mut conn = db.async_conn().await;
+
+            let (release_id, _) =
+                fake_release_that_failed_before_build(&mut conn, "a", "1.0.0", "some-error")
+                    .await?;
 
-            delete_crate(&mut db.conn(), &env.storage(), &env.config(), "a")?;
+            delete_crate(&mut conn, &*env.async_storage().await, &env.config(), "a").await?;
 
-            assert!(!crate_exists(&mut db.conn(), "a")?);
-            assert!(!release_exists(&mut db.conn(), release_id)?);
+            assert!(!crate_exists(&mut conn, "a").await?);
+            assert!(!release_exists(&mut conn, release_id).await?);
 
             Ok(())
         })

src/web/builds.rs

@@ -163,7 +163,7 @@ async fn build_trigger_check(
     }
 
     let crate_version_is_in_queue = build_queue
-        .has_build_queued(&mut *conn, &name, &version.to_string())
+        .has_build_queued(&mut *conn, name, &version.to_string())
         .await?;
 
     if crate_version_is_in_queue {
@@ -204,7 +204,7 @@ pub(crate) async fn build_trigger_rebuild_handler(
         )));
     }
 
-    build_trigger_check(&mut *conn, &name, &version, &build_queue)
+    build_trigger_check(&mut conn, &name, &version, &build_queue)
         .await
         .map_err(JsonAxumNope)?;
 
@@ -258,13 +258,25 @@ async fn get_builds(
 mod tests {
     use super::BuildStatus;
     use crate::{
-        test::{assert_cache_control, fake_release_that_failed_before_build, wrapper, FakeBuild},
+        test::{
+            assert_cache_control, fake_release_that_failed_before_build, wrapper, FakeBuild,
+            TestEnvironment,
+        },
         web::cache::CachePolicy,
     };
     use chrono::{DateTime, Duration, Utc};
     use kuchikiki::traits::TendrilSink;
     use reqwest::StatusCode;
 
+    fn has_build_queued(env: &TestEnvironment, name: &str, version: &str) -> anyhow::Result<bool> {
+        env.runtime().block_on(async move {
+            let mut conn = env.async_db().await.async_conn().await;
+            let build_queue = env.build_queue();
+
+            build_queue.has_build_queued(&mut conn, name, version).await
+        })
+    }
+
     #[test]
     fn build_list_empty_build() {
         wrapper(|env| {
@@ -496,7 +508,7 @@ mod tests {
             }
 
             assert_eq!(env.build_queue().pending_count()?, 0);
-            assert!(!env.build_queue().has_build_queued("foo", "0.1.0")?);
+            assert!(!has_build_queued(env, "foo", "0.1.0")?);
 
             {
                 let response = env
@@ -510,7 +522,7 @@ mod tests {
             }
 
             assert_eq!(env.build_queue().pending_count()?, 1);
-            assert!(env.build_queue().has_build_queued("foo", "0.1.0")?);
+            assert!(has_build_queued(env, "foo", "0.1.0")?);
 
             {
                 let response = env
@@ -530,7 +542,7 @@ mod tests {
             }
 
             assert_eq!(env.build_queue().pending_count()?, 1);
-            assert!(env.build_queue().has_build_queued("foo", "0.1.0")?);
+            assert!(has_build_queued(env, "foo", "0.1.0")?);
 
             Ok(())
         });