remove special AxumNope::InternalTokio error variant

Author: syphar

src/web/error.rs

@@ -157,8 +157,6 @@ pub enum AxumNope {
     InternalServerError,
     #[error("internal error")]
     InternalError(#[from] anyhow::Error),
-    #[error("internal threading error")]
-    InternalTokio(#[from] tokio::task::JoinError),
 }
 
 impl IntoResponse for AxumNope {
@@ -221,25 +219,19 @@ impl IntoResponse for AxumNope {
                 }
                 .into_response()
             }
-            AxumNope::InternalError(source) => generate_internal_error_page(source).into_response(),
-            AxumNope::InternalTokio(source) => generate_internal_error_page(source).into_response(),
-        }
-    }
-}
-
-fn generate_internal_error_page<E: Into<anyhow::Error>>(error: E) -> impl IntoResponse {
-    let error = anyhow::anyhow!(error);
-
-    let web_error = crate::web::AxumErrorPage {
-        title: "Internal Server Error",
-        message: Cow::Owned(error.to_string()),
-        status: StatusCode::INTERNAL_SERVER_ERROR,
-    };
+            AxumNope::InternalError(source) => {
+                let web_error = crate::web::AxumErrorPage {
+                    title: "Internal Server Error",
+                    message: Cow::Owned(source.to_string()),
+                    status: StatusCode::INTERNAL_SERVER_ERROR,
+                };
 
-    // TODO: check: does the sentry tower layer add the request as context?
-    crate::utils::report_error(&error);
+                crate::utils::report_error(&source);
 
-    web_error
+                web_error.into_response()
+            }
+        }
+    }
 }
 
 #[cfg(test)]

src/web/sitemap.rs

@@ -5,6 +5,7 @@ use crate::{
     utils::{get_config, ConfigName},
     web::{error::AxumNope, page::WebPage},
 };
+use anyhow::Context;
 use axum::{
     extract::{Extension, Path},
     response::IntoResponse,
@@ -91,7 +92,8 @@ pub(crate) async fn sitemap_handler(
             })
             .collect())
     })
-    .await??;
+    .await
+    .context("failed to join thread")??;
 
     Ok(SitemapXml { releases })
 }
@@ -115,7 +117,8 @@ pub(crate) async fn about_builds_handler(
         let mut conn = pool.get()?;
         get_config::<String>(&mut conn, ConfigName::RustcVersion)
     })
-    .await??;
+    .await
+    .context("failed to join thread")??;
 
     Ok(AboutBuilds {
         rustc_version,