Simplify spawn_blocking() wrapper fn (#10002)

The idea for our wrapper to require a `Result` return type for the callback function might have been good in theory, but leads to too many small annoyances in practice. Let's get rid of it and move back closer to the original `spawn_blocking()` implementation from `tokio`.

Author: Turbo87

src/bin/crates-admin/default_versions.rs

@@ -48,5 +48,5 @@ pub async fn run(command: Command) -> anyhow::Result<()> {
 
         Ok(())
     })
-    .await
+    .await?
 }

src/bin/crates-admin/delete_version.rs

@@ -64,7 +64,7 @@ pub async fn run(opts: Opts) -> anyhow::Result<()> {
         }
     }
 
-    let opts = spawn_blocking::<_, _, anyhow::Error>(move || {
+    let opts = spawn_blocking(move || {
         use diesel::RunQueryDsl;
 
         let conn: &mut AsyncConnectionWrapper<_> = &mut conn.into();
@@ -110,8 +110,8 @@ pub async fn run(opts: Opts) -> anyhow::Result<()> {
             warn!(%crate_name, ?error, "Failed to enqueue SyncToSparseIndex job");
         }
 
-        Ok(opts)
-    }).await?;
+        Ok::<_, anyhow::Error>(opts)
+    }).await??;
 
     let crate_name = &opts.crate_name;
 

src/bin/crates-admin/dialoguer.rs

@@ -3,7 +3,7 @@ use crates_io::tasks::spawn_blocking;
 
 pub async fn confirm(msg: impl Into<String>) -> anyhow::Result<bool> {
     let msg = msg.into();
-    spawn_blocking(move || sync_confirm(msg).map_err(anyhow::Error::from)).await
+    spawn_blocking(move || sync_confirm(msg).map_err(anyhow::Error::from)).await?
 }
 
 fn sync_confirm(msg: impl Into<String>) -> dialoguer::Result<bool> {

src/bin/crates-admin/migrate.rs

@@ -54,7 +54,7 @@ pub async fn run(_opts: Opts) -> Result<(), Error> {
 
         Ok::<_, Error>(conn)
     })
-    .await?;
+    .await??;
 
     info!("Synchronizing crate categories");
     crates_io::boot::categories::sync_with_connection(CATEGORIES_TOML, &mut conn).await?;

src/bin/crates-admin/render_readmes.rs

@@ -175,7 +175,7 @@ async fn get_readme(
         let archive = Archive::new(reader);
         render_pkg_readme(archive, &pkg_name)
     })
-    .await
+    .await?
 }
 
 fn render_pkg_readme<R: Read>(mut archive: Archive<R>, pkg_name: &str) -> anyhow::Result<String> {

src/bin/crates-admin/upload_index.rs

@@ -30,7 +30,7 @@ pub async fn run(opts: Opts) -> anyhow::Result<()> {
 
         Ok::<_, anyhow::Error>((repo, files))
     })
-    .await?;
+    .await??;
 
     if !dialoguer::confirm("continue with upload?").await? {
         return Ok(());

src/controllers/crate_owner_invitation.rs

@@ -65,7 +65,7 @@ pub async fn list(app: AppState, req: Parts) -> AppResult<ErasedJson> {
             "users": users,
         }))
     })
-    .await
+    .await?
 }
 
 /// Handles the `GET /api/private/crate_owner_invitations` route.
@@ -86,7 +86,7 @@ pub async fn private_list(app: AppState, req: Parts) -> AppResult<Json<PrivateLi
         let list = prepare_list(&app, &req, auth, filter, conn)?;
         Ok(Json(list))
     })
-    .await
+    .await?
 }
 
 enum ListFilter {

src/controllers/keyword.rs

@@ -46,7 +46,7 @@ pub async fn index(state: AppState, qp: Query<IndexQuery>, req: Parts) -> AppRes
             "meta": { "total": total },
         }))
     })
-    .await
+    .await?
 }
 
 /// Handles the `GET /keywords/:keyword_id` route.

src/controllers/krate/metadata.rs

@@ -164,7 +164,7 @@ pub async fn show(app: AppState, Path(name): Path<String>, req: Parts) -> AppRes
             "categories": encodable_cats,
         }))
     })
-    .await
+    .await?
 }
 
 #[derive(Debug)]

src/controllers/krate/owners.rs

@@ -80,7 +80,7 @@ pub async fn owner_user(state: AppState, Path(crate_name): Path<String>) -> AppR
 
         Ok(json!({ "users": owners }))
     })
-    .await
+    .await?
 }
 
 /// Handles the `PUT /crates/:crate_id/owners` route.
@@ -246,7 +246,7 @@ async fn modify_owners(
 
         Ok(json!({ "msg": comma_sep_msg, "ok": true }))
     })
-    .await
+    .await?
 }
 
 pub struct OwnerInviteEmail {