rust-embed

rust macro which loads files into the rust binary at compile time during release and loads the file from the fs during dev.

f5dd61b4 — Peter John

Merge pull request #201 from DusterTheFirst/axum-fix

Files changed (2) hide show

examples/axum-spa/main.rs CHANGED Viewed

@@ -1,8 +1,7 @@
 use axum::{
   body::{boxed, Full},
-  handler::Handler,
   http::{header, StatusCode, Uri},
-  response::Response,
+  response::{IntoResponse, Response},
   routing::Router,
 };
 use rust_embed::RustEmbed;
@@ -16,14 +15,14 @@ struct Assets;
 #[tokio::main]
 async fn main() {
-  let app = Router::new().fallback(static_handler.into_service());
+  let app = Router::new().fallback(static_handler);
   let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
   println!("listening on {}", addr);
   axum::Server::bind(&addr).serve(app.into_make_service()).await.unwrap();
 }
-async fn static_handler(uri: Uri) -> Response {
+async fn static_handler(uri: Uri) -> impl IntoResponse {
   let path = uri.path().trim_start_matches('/');
   if path.is_empty() || path == INDEX_HTML {

examples/axum.rs CHANGED Viewed

@@ -1,6 +1,5 @@
 use axum::{
   body::{boxed, Full},
-  handler::HandlerWithoutStateExt,
   http::{header, StatusCode, Uri},
   response::{Html, IntoResponse, Response},
   routing::{get, Router},
@@ -14,7 +13,7 @@ async fn main() {
   let app = Router::new()
     .route("/", get(index_handler))
     .route("/index.html", get(index_handler))
-    .route_service("/dist/*file", static_handler.into_service())
+    .route("/dist/*file", get(static_handler))
     .fallback_service(get(not_found));
   // Start listening on the given address.