Merge pull request #213 from hongquan/feature/shorter-axum

Shorter example code for axum
pyrossh · Jul 14, 2023 · a1f5565 · a1f5565
2 parents 494d979 + 2c88c43
commit a1f5565
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/examples/axum-spa/main.rs b/examples/axum-spa/main.rs
@@ -1,7 +1,6 @@
 use axum::{
-  body::{boxed, Full},
   http::{header, StatusCode, Uri},
-  response::{IntoResponse, Response},
+  response::{Html, IntoResponse, Response},
   routing::Router,
 };
 use rust_embed::RustEmbed;
@@ -31,10 +30,9 @@ async fn static_handler(uri: Uri) -> impl IntoResponse {
 
   match Assets::get(path) {
     Some(content) => {
-      let body = boxed(Full::from(content.data));
       let mime = mime_guess::from_path(path).first_or_octet_stream();
 
-      Response::builder().header(header::CONTENT_TYPE, mime.as_ref()).body(body).unwrap()
+      ([(header::CONTENT_TYPE, mime.as_ref())], content.data).into_response()
     }
     None => {
       if path.contains('.') {
@@ -48,15 +46,11 @@ async fn static_handler(uri: Uri) -> impl IntoResponse {
 
 async fn index_html() -> Response {
   match Assets::get(INDEX_HTML) {
-    Some(content) => {
-      let body = boxed(Full::from(content.data));
-
-      Response::builder().header(header::CONTENT_TYPE, "text/html").body(body).unwrap()
-    }
+    Some(content) => Html(content.data).into_response(),
     None => not_found().await,
   }
 }
 
 async fn not_found() -> Response {
-  Response::builder().status(StatusCode::NOT_FOUND).body(boxed(Full::from("404"))).unwrap()
+  (StatusCode::NOT_FOUND, "404").into_response()
 }
diff --git a/examples/axum.rs b/examples/axum.rs
@@ -1,5 +1,4 @@
 use axum::{
-  body::{boxed, Full},
   http::{header, StatusCode, Uri},
   response::{Html, IntoResponse, Response},
   routing::{get, Router},
@@ -61,11 +60,10 @@ where
 
     match Asset::get(path.as_str()) {
       Some(content) => {
-        let body = boxed(Full::from(content.data));
         let mime = mime_guess::from_path(path).first_or_octet_stream();
-        Response::builder().header(header::CONTENT_TYPE, mime.as_ref()).body(body).unwrap()
+        ([(header::CONTENT_TYPE, mime.as_ref())], content.data).into_response()
       }
-      None => Response::builder().status(StatusCode::NOT_FOUND).body(boxed(Full::from("404"))).unwrap(),
+      None => (StatusCode::NOT_FOUND, "404 Not Found").into_response(),
     }
   }
 }