From 7261c49c46d620cc89c99518ab5594fcef155604 Mon Sep 17 00:00:00 2001 From: Leo Gaskin Date: Sat, 25 Feb 2023 21:27:12 +0100 Subject: [PATCH] Remove code wrapping ServeDir Made possible by tower-rs/tower-http#283 --- examples/axum-in-process/src/main.rs | 13 ++----------- examples/livehttpd/src/main.rs | 13 ++----------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/examples/axum-in-process/src/main.rs b/examples/axum-in-process/src/main.rs index 231256f..7dc4951 100644 --- a/examples/axum-in-process/src/main.rs +++ b/examples/axum-in-process/src/main.rs @@ -1,24 +1,15 @@ -use axum::{http, routing::get_service, Router}; +use axum::Router; use notify::Watcher; use std::path::Path; use tower_http::services::ServeDir; use tower_livereload::LiveReloadLayer; -fn serve_dir(path: &Path) -> axum::routing::MethodRouter { - get_service(ServeDir::new(path)).handle_error(|error| async move { - ( - http::StatusCode::INTERNAL_SERVER_ERROR, - format!("Unhandled internal error: {}", error), - ) - }) -} - #[tokio::main] async fn main() -> Result<(), Box> { let livereload = LiveReloadLayer::new(); let reloader = livereload.reloader(); let app = Router::new() - .nest_service("/", serve_dir(Path::new("assets"))) + .nest_service("/", ServeDir::new(Path::new("assets"))) .layer(livereload); let mut watcher = notify::recommended_watcher(move |_| reloader.reload())?; diff --git a/examples/livehttpd/src/main.rs b/examples/livehttpd/src/main.rs index 188860f..55231f2 100644 --- a/examples/livehttpd/src/main.rs +++ b/examples/livehttpd/src/main.rs @@ -1,4 +1,4 @@ -use axum::{http, routing::get_service, Router}; +use axum::{http, Router}; use clap::Parser; use notify::Watcher; use tower::layer::util::Stack; @@ -22,15 +22,6 @@ struct Command { directory: std::path::PathBuf, } -fn serve_dir(path: &std::path::Path) -> axum::routing::MethodRouter { - get_service(ServeDir::new(path)).handle_error(|error| async move { - ( - http::StatusCode::INTERNAL_SERVER_ERROR, - format!("Unhandled internal error: {}", error), - ) - }) -} - type Srhl = SetResponseHeaderLayer; fn no_cache_layer() -> Stack> { @@ -65,7 +56,7 @@ async fn try_main() -> Result<(), Box> { let livereload = LiveReloadLayer::new(); let reloader = livereload.reloader(); let app = Router::new() - .nest_service("/", serve_dir(&args.directory)) + .nest_service("/", ServeDir::new(&args.directory)) .layer(livereload) .layer(no_cache_layer());