models/krate: Inline NewCrate::create_or_update() fn

Author: Turbo87

src/controllers/krate/publish.rs

@@ -154,7 +154,15 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
                 return Err(cargo_err("cannot upload a crate with a reserved name"));
             }
 
-            let krate = persist.create_or_update(conn, user.id)?;
+            let krate = conn.transaction(|conn| {
+                // To avoid race conditions, we try to insert
+                // first so we know whether to add an owner
+                if let Some(krate) = persist.create(conn, user.id).optional()? {
+                    return Ok(krate);
+                }
+
+                persist.update(conn)
+            })?;
 
             let owners = krate.owners(conn)?;
             if user.rights(&app, &owners)? < Rights::Publish {

src/models/krate.rs

@@ -101,18 +101,6 @@ pub struct NewCrate<'a> {
 }
 
 impl<'a> NewCrate<'a> {
-    pub fn create_or_update(self, conn: &mut PgConnection, uploader: i32) -> AppResult<Crate> {
-        conn.transaction(|conn| {
-            // To avoid race conditions, we try to insert
-            // first so we know whether to add an owner
-            if let Some(krate) = self.create(conn, uploader).optional()? {
-                return Ok(krate);
-            }
-
-            Ok(self.update(conn)?)
-        })
-    }
-
     pub fn update(&self, conn: &mut PgConnection) -> QueryResult<Crate> {
         use diesel::update;