upgrade tower-http, remove workaround

This includes tower-rs/tower-http#331

Author: syphar

Cargo.lock

@@ -90,7 +90,7 @@ axum-extra = "0.5.0"
 hyper = { version = "0.14.15", default-features = false }
 tower = "0.4.11"
 tower-service = "0.3.2"
-tower-http = { version = "0.3.4", features = ["fs", "trace"] }
+tower-http = { version = "0.4.0", features = ["fs", "trace"] }
 mime = "0.3.16"
 percent-encoding = "2.2.0"
 

Cargo.toml

@@ -1,4 +1,4 @@
-use super::{cache::CachePolicy, error::AxumNope, metrics::request_recorder, routes::get_static};
+use super::{cache::CachePolicy, metrics::request_recorder, routes::get_static};
 use axum::{
     extract::Extension,
     headers::HeaderValue,
@@ -9,7 +9,6 @@ use axum::{
     routing::get_service,
     Router as AxumRouter,
 };
-use std::io;
 use tower_http::services::ServeDir;
 
 const VENDORED_CSS: &str = include_str!(concat!(env!("OUT_DIR"), "/vendored.css"));
@@ -18,19 +17,6 @@ const RUSTDOC_CSS: &str = include_str!(concat!(env!("OUT_DIR"), "/rustdoc.css"))
 const RUSTDOC_2021_12_05_CSS: &str =
     include_str!(concat!(env!("OUT_DIR"), "/rustdoc-2021-12-05.css"));
 
-/// handle io-errors while serving static files.
-///
-/// Some errors can directly converted into a `404 NOT FOUND`,
-/// the rest will lead to a server error.
-async fn handle_error(err: io::Error) -> impl IntoResponse {
-    match err.raw_os_error() {
-        // ENOTDIR -> "not a directory
-        Some(20) => AxumNope::ResourceNotFound,
-        // fallback: raise a server error
-        _ => AxumNope::InternalError(err.into()),
-    }
-}
-
 fn build_static_css_response(content: &'static str) -> impl IntoResponse {
     (
         Extension(CachePolicy::ForeverInCdnAndBrowser),
@@ -83,7 +69,6 @@ pub(crate) fn build_static_router() -> AxumRouter {
         .nest_service(
             "/",
             get_service(ServeDir::new("static").fallback(ServeDir::new("vendor")))
-                .handle_error(handle_error)
                 .layer(middleware::from_fn(set_needed_static_headers))
                 .layer(middleware::from_fn(|request, next| async {
                     request_recorder(request, next, Some("static resource")).await