fix: breaking: Router::fallback now only accepts Handlers (similarly …

…to what get, post, etc accept). Use the new Router::fallback_service for setting any Service as the fallback (#1155) Refs: tokio-rs/axum#1155
ttys3 · Aug 22, 2022 · 98ae7ba · 98ae7ba
1 parent 46310ba
commit 98ae7ba
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 55 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/main.rs b/src/main.rs
@@ -2,8 +2,6 @@ use axum_macros::debug_handler;
 use std::{net::SocketAddr, sync::Arc};
 use tower_http::trace::TraceLayer;
 
-// use axum::{extract::Path as extractPath};
-
 use crate::ResponseError::{BadRequest, FileNotFound, InternalError};
 use askama::Template;
 
@@ -30,6 +28,7 @@ use clap::Parser;
 use axum::extract::ConnectInfo;
 use percent_encoding::percent_decode;
 use std::str::FromStr;
+use axum::handler::HandlerWithoutStateExt;
 
 #[derive(Parser, Debug)]
 #[clap(name = "static-server", about = "A simple static file server written in Rust based on axum framework.")]
@@ -80,7 +79,7 @@ async fn main() {
     let app = Router::new()
         .route("/favicon.ico", get(favicon))
         .route("/healthz", get(health_check))
-        .fallback(get(index_or_content))
+        .fallback_service(index_or_content.into_service())
         .layer(Extension(Arc::new(StaticServerConfig { root_dir })))
         .layer(TraceLayer::new_for_http().make_span_with(|request: &Request<Body>| {
             let ConnectInfo(addr) = request.extensions().get::<ConnectInfo<SocketAddr>>().unwrap();