models/version: Remove sync fns

Author: Turbo87

src/controllers/krate/publish.rs

@@ -400,7 +400,7 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
             .maybe_edition(edition)
             .build();
 
-        let version = new_version.async_save(conn, &verified_email_address).await.map_err(|error| {
+        let version = new_version.save(conn, &verified_email_address).await.map_err(|error| {
             use diesel::result::{Error, DatabaseErrorKind};
             match error {
                 Error::DatabaseError(DatabaseErrorKind::UniqueViolation, _) =>

src/models/krate.rs

@@ -126,11 +126,7 @@ impl<'a> NewCrate<'a> {
             .await
     }
 
-    pub async fn create(
-        &self,
-        conn: &mut AsyncPgConnection,
-        user_id: i32,
-    ) -> QueryResult<Crate> {
+    pub async fn create(&self, conn: &mut AsyncPgConnection, user_id: i32) -> QueryResult<Crate> {
         use diesel_async::RunQueryDsl;
 
         conn.transaction(|conn| {
@@ -356,10 +352,7 @@ impl Crate {
     /// Return both the newest (most recently updated) and
     /// highest version (in semver order) for the current crate,
     /// where all top versions are not yanked.
-    pub async fn top_versions(
-        &self,
-        conn: &mut AsyncPgConnection,
-    ) -> QueryResult<TopVersions> {
+    pub async fn top_versions(&self, conn: &mut AsyncPgConnection) -> QueryResult<TopVersions> {
         use diesel_async::RunQueryDsl;
 
         Ok(TopVersions::from_date_version_pairs(

src/models/version.rs

@@ -3,14 +3,13 @@ use std::collections::BTreeMap;
 use bon::Builder;
 use chrono::NaiveDateTime;
 use crates_io_index::features::FeaturesMap;
+use diesel::prelude::*;
 use diesel_async::scoped_futures::ScopedFutureExt;
-use diesel_async::{AsyncConnection, AsyncPgConnection};
+use diesel_async::{AsyncConnection, AsyncPgConnection, RunQueryDsl};
 use serde::Deserialize;
 
 use crate::models::{Crate, User};
 use crate::schema::*;
-use crate::util::diesel::prelude::*;
-use crate::util::diesel::Conn;
 
 // Queryable has a custom implementation below
 #[derive(Clone, Identifiable, Associations, Debug, Queryable, Selectable)]
@@ -43,7 +42,6 @@ impl Version {
         conn: &mut AsyncPgConnection,
     ) -> QueryResult<usize> {
         use diesel::dsl::now;
-        use diesel_async::RunQueryDsl;
 
         diesel::insert_into(readme_renderings::table)
             .values(readme_renderings::version_id.eq(version_id))
@@ -57,8 +55,6 @@ impl Version {
     /// Gets the User who ran `cargo publish` for this version, if recorded.
     /// Not for use when you have a group of versions you need the publishers for.
     pub async fn published_by(&self, conn: &mut AsyncPgConnection) -> QueryResult<Option<User>> {
-        use diesel_async::RunQueryDsl;
-
         match self.published_by {
             Some(pb) => users::table.find(pb).first(conn).await.optional(),
             None => Ok(None),
@@ -102,30 +98,12 @@ pub struct NewVersion<'a> {
 }
 
 impl NewVersion<'_> {
-    pub fn save(&self, conn: &mut impl Conn, published_by_email: &str) -> QueryResult<Version> {
-        use diesel::insert_into;
-        use diesel::RunQueryDsl;
-
-        conn.transaction(|conn| {
-            let version: Version = insert_into(versions::table).values(self).get_result(conn)?;
-
-            insert_into(versions_published_by::table)
-                .values((
-                    versions_published_by::version_id.eq(version.id),
-                    versions_published_by::email.eq(published_by_email),
-                ))
-                .execute(conn)?;
-            Ok(version)
-        })
-    }
-
-    pub async fn async_save(
+    pub async fn save(
         &self,
         conn: &mut AsyncPgConnection,
         published_by_email: &str,
     ) -> QueryResult<Version> {
         use diesel::insert_into;
-        use diesel_async::RunQueryDsl;
 
         conn.transaction(|conn| {
             async move {

src/tests/builders/version.rs

@@ -114,9 +114,7 @@ impl VersionBuilder {
             .maybe_created_at(self.created_at.as_ref())
             .build();
 
-        let vers = new_version
-            .async_save(connection, "[email protected]")
-            .await?;
+        let vers = new_version.save(connection, "[email protected]").await?;
 
         let new_deps = self
             .dependencies

src/worker/jobs/downloads/update_metadata.rs

@@ -133,10 +133,7 @@ mod tests {
             .checksum("0000000000000000000000000000000000000000000000000000000000000000")
             .build();
 
-        let version = version
-            .async_save(conn, "[email protected]")
-            .await
-            .unwrap();
+        let version = version.save(conn, "[email protected]").await.unwrap();
         (krate, version)
     }