fix: more generics

- pages now return impl IntoResponse instead of Response
- tokio features instead of full, now rt-multi-thread and macros

Author: storopoli

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "stoic-quotes"
-version = "0.3.5"
+version = "0.3.6"
 edition = "2021"
 authors = ["Jose Storopoli <[email protected]>"]
 description = "Stoic quotes API backend"
@@ -15,7 +15,7 @@ lazy_static = "1"
 rand = "0.8"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-tokio = { version = "1", features = ["full"] }
+tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
 tower-http = { version = "0.5", features = ["tracing", "trace", "fs"] }
 tracing = "0.1"
 tracing-subscriber = "0.3"

src/app.rs

@@ -1,7 +1,7 @@
 //! Module that has functions that handles the Axum [`Router`].
 
 use crate::pages::{plain_quote, quote, root};
-use axum::{http::header::USER_AGENT, http::Request, response::Response, routing::get, Router};
+use axum::{http::header::USER_AGENT, http::Request, response::IntoResponse, routing::get, Router};
 use std::{env::current_dir, path::PathBuf};
 use tower_http::{services::ServeDir, trace::TraceLayer};
 use tracing::info;
@@ -10,7 +10,7 @@ use tracing::info;
 /// If the user agent is `curl` or `wget`,
 /// return a plain quote.
 /// Otherwise, return the root page.
-async fn handle_user_agent<T>(req: Request<T>) -> Response {
+async fn handle_user_agent<T>(req: Request<T>) -> impl IntoResponse {
     let header = Request::headers(&req);
     let user_agent: String = if let Some(user_agent) = header.get(USER_AGENT) {
         user_agent.clone().to_str().unwrap().to_string()
@@ -21,9 +21,9 @@ async fn handle_user_agent<T>(req: Request<T>) -> Response {
     info!("got user agent: {user_agent}");
 
     if user_agent.contains("curl") || user_agent.contains("Wget") {
-        plain_quote().await
+        plain_quote().await.into_response()
     } else {
-        root().await
+        root().await.into_response()
     }
 }
 

src/pages.rs

@@ -49,20 +49,20 @@ struct QuoteTemplate {
 }
 
 /// Returns the rendered askama template for the root HTML element.
-pub async fn root() -> Response {
+pub async fn root() -> impl IntoResponse {
     let template = IndexTemplate {};
     HtmlTemplate(template).into_response()
 }
 
 /// Returns the rendered askama template for a random quote HTML element.
-pub async fn quote() -> Response {
+pub async fn quote() -> impl IntoResponse {
     let Quote { text, author } = random_quote();
     let template = QuoteTemplate { text, author };
     HtmlTemplate(template).into_response()
 }
 
 /// Returns a plain text random quote without any HTML.
-pub async fn plain_quote() -> Response {
+pub async fn plain_quote() -> impl IntoResponse {
     let Quote { text, author } = random_quote();
     let formatted_quote: String = format!("{text}\n\n - {author}\n");
     Html(formatted_quote).into_response()