From 3ae8d5ea33d35d43a471d0910c77ed6dad9ec209 Mon Sep 17 00:00:00 2001
From: Xe Iaso <me@xeiaso.net>
Date: Tue, 28 Mar 2023 18:01:39 -0400
Subject: Fix for tower-http 0.4.0

Signed-off-by: Xe Iaso <me@xeiaso.net>
---
 src/main.rs | 38 +++++---------------------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

(limited to 'src')

diff --git a/src/main.rs b/src/main.rs
index 68f3371..0186e5f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,7 +14,7 @@ use color_eyre::eyre::Result;
 use hyper::StatusCode;
 use prometheus::{Encoder, TextEncoder};
 use std::{
-    env, io,
+    env,
     net::{IpAddr, SocketAddr},
     str::FromStr,
     sync::Arc,
@@ -114,47 +114,19 @@ async fn main() -> Result<()> {
         .route("/metrics", get(metrics))
         .route(
             "/sw.js",
-            get_service(ServeFile::new("./static/js/sw.js")).handle_error(
-                |err: io::Error| async move {
-                    (
-                        StatusCode::INTERNAL_SERVER_ERROR,
-                        format!("unhandled internal server error: {}", err),
-                    )
-                },
-            ),
+            get_service(ServeFile::new("./static/js/sw.js")),
         )
         .route(
             "/.well-known/assetlinks.json",
-            get_service(ServeFile::new("./static/assetlinks.json")).handle_error(
-                |err: io::Error| async move {
-                    (
-                        StatusCode::INTERNAL_SERVER_ERROR,
-                        format!("unhandled internal server error: {}", err),
-                    )
-                },
-            ),
+            get_service(ServeFile::new("./static/assetlinks.json")),
         )
         .route(
             "/robots.txt",
-            get_service(ServeFile::new("./static/robots.txt")).handle_error(
-                |err: io::Error| async move {
-                    (
-                        StatusCode::INTERNAL_SERVER_ERROR,
-                        format!("unhandled internal server error: {}", err),
-                    )
-                },
-            ),
+            get_service(ServeFile::new("./static/robots.txt")),
         )
         .route(
             "/favicon.ico",
-            get_service(ServeFile::new("./static/favicon/favicon.ico")).handle_error(
-                |err: io::Error| async move {
-                    (
-                        StatusCode::INTERNAL_SERVER_ERROR,
-                        format!("unhandled internal server error: {}", err),
-                    )
-                },
-            ),
+            get_service(ServeFile::new("./static/favicon/favicon.ico")),
         )
         // api
         .route("/api/pronouns", get(handlers::api::pronouns))
-- 
cgit v1.2.3