switch to using new axum-extra option_layer

Author: syphar

src/web/error.rs

@@ -133,13 +133,6 @@ impl From<anyhow::Error> for AxumNope {
 
 pub(crate) type AxumResult<T> = Result<T, AxumNope>;
 
-/// This function is only necessary because `.option_layer()` changes the error type
-/// and we need to change it back. Since the axum middleware has no way of returning
-/// an actual error this function should never actually be called.
-pub(crate) async fn dummy_error_handler(_err: axum::BoxError) -> http::StatusCode {
-    http::StatusCode::INTERNAL_SERVER_ERROR
-}
-
 #[cfg(test)]
 mod tests {
     use crate::test::wrapper;

src/web/mod.rs

@@ -31,7 +31,6 @@ mod statics;
 use crate::{db::Pool, impl_axum_webpage, Context};
 use anyhow::Error;
 use axum::{
-    error_handling::HandleErrorLayer,
     extract::Extension,
     http::Request as AxumRequest,
     http::StatusCode,
@@ -291,8 +290,7 @@ fn apply_middleware(
             .layer(Extension(context.config()?))
             .layer(Extension(context.storage()?))
             .layer(Extension(context.repository_stats_updater()?))
-            .layer(HandleErrorLayer::new(error::dummy_error_handler))
-            .option_layer(template_data.map(Extension))
+            .layer(option_layer(template_data.map(Extension)))
             .layer(middleware::from_fn(csp::csp_middleware))
             .layer(middleware::from_fn(
                 page::web_page::render_templates_middleware,