Remove serve_template

It felt unnecessary

2 files changed, 11 insertions, 12 deletions

diff --git a/src/main.rs b/src/main.rs
index 02427e7..f4782ac 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -20,7 +20,7 @@ use crate::template::{IndexTemplate, SessionTemplate};
 use askama::Template;
 use axum::extract::{Path, Query, State, WebSocketUpgrade};
 use axum::http::{StatusCode, header};
-use axum::response::{Html, IntoResponse, Redirect, Response};
+use axum::response::{ErrorResponse, Html, IntoResponse, Redirect, Response};
 use axum::routing::{any, get, put};
 use axum::{Json, Router};
 use rust_embed::Embed;
@@ -60,16 +60,12 @@ async fn main() {
     axum::serve(listener, app).await.unwrap();
 }
 
-fn serve_template(template: &impl Template) -> Result<Html<String>, &'static str> {
-    template.render().map(Html).map_err(|err| {
-        eprintln!("Template render error: {}", err);
-        "Template render error"
-    })
-}
-
 async fn serve_index() -> axum::response::Result<Html<String>> {
     let template = IndexTemplate;
-    Ok(serve_template(&template)?)
+    Template::render(&template)
+        .map(Html)
+        .inspect_err(|e| eprintln!("Template render error: {}", e))
+        .map_err(|_| ErrorResponse::from(StatusCode::INTERNAL_SERVER_ERROR))
 }
 
 async fn serve_static(Path(path): Path<String>) -> Response {
@@ -105,10 +101,13 @@ async fn visit_session(
         .unwrap();
 
     let template = SessionTemplate {
-        id: &id,
+        id: id.as_str(),
         session: &session,
     };
-    Ok(serve_template(&template)?)
+    Template::render(&template)
+        .map(Html)
+        .inspect_err(|e| eprintln!("Template render error: {}", e))
+        .map_err(|_| ErrorResponse::from(StatusCode::INTERNAL_SERVER_ERROR))
 }
 
 async fn create_session(
diff --git a/src/template.rs b/src/template.rs
index 34fe69a..654da45 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -8,6 +8,6 @@ pub struct IndexTemplate;
 #[derive(Template)]
 #[template(path = "session.html")]
 pub struct SessionTemplate<'a> {
-    pub id: &'a String,
+    pub id: &'a str,
     pub session: &'a Session,
 }