rebase, resolve conflicts

Author: Marco Napetti

src/controllers/krate/delete.rs

@@ -1,7 +1,5 @@
 //! Functionality related to deleting a crate.
 
-use std::sync::Arc;
-
 use chrono::{Duration, Utc};
 use diesel::dsl::count_star;
 
@@ -11,16 +9,17 @@ use crate::schema::*;
 use crate::util::errors::internal;
 use crate::views::{EncodableCrate, GoodCrate, PublishWarnings};
 
-use super::{extract_crate_name_and_semver, version_and_crate};
+use super::version_and_crate;
 
 /// Handles the `DELETE /crates/:crate_id/:version` route.
 ///
 /// Actually deletion is allowed only in the first 24 hours from creation
-pub fn delete(req: &mut dyn RequestExt) -> EndpointResult {
-    let app = Arc::clone(req.app());
-    let (crate_name, semver) = extract_crate_name_and_semver(req)?;
-    let conn = req.db_read()?;
-    let (version, krate) = version_and_crate(&conn, crate_name, semver)?;
+pub async fn delete(
+    app: AppState,
+    Path((crate_name, semver)): Path<(String, String)>,
+) -> AppResult<Json<GoodCrate>> {
+    let conn = app.db_read()?;
+    let (version, krate) = version_and_crate(&conn, &crate_name, &semver)?;
 
     if Utc::now()
         .naive_utc()
@@ -54,10 +53,10 @@ pub fn delete(req: &mut dyn RequestExt) -> EndpointResult {
             let uploader = app.config.uploader();
             uploader
                 .delete_index(app.http_client(), &krate.name)
-                .map_err(|e| internal(&format_args!("failed to delete crate: {}", e)))?;
+                .map_err(|e| internal(format_args!("failed to delete crate: {e}")))?;
         }
 
-        Ok(req.json(&GoodCrate {
+        Ok(Json(GoodCrate {
             krate: EncodableCrate::from_minimal(krate, Some(&top_versions), None, true, None),
             warnings: PublishWarnings {
                 invalid_categories: vec![],

src/controllers/version/delete.rs

@@ -25,6 +25,10 @@ pub fn build_axum_router(state: AppState) -> Router {
                 .put(krate::owners::add_owners)
                 .delete(krate::owners::remove_owners),
         )
+        .route(
+            "/api/v1/crates/:crate_id/:version",
+            delete(version::delete::delete),
+        )
         .route(
             "/api/v1/crates/:crate_id/:version/yank",
             delete(version::yank::yank),
@@ -93,7 +97,6 @@ pub fn build_axum_router(state: AppState) -> Router {
             "/api/v1/crates/:crate_id/reverse_dependencies",
             get(krate::metadata::reverse_dependencies),
         )
-        .route("/api/v1/crates/:crate_id", delete(krate::delete::delete))
         .route("/api/v1/keywords", get(keyword::index))
         .route("/api/v1/keywords/:keyword_id", get(keyword::show))
         .route("/api/v1/categories", get(category::index))