From 56f1a1375ea775d3f619337f5196079951b93125 Mon Sep 17 00:00:00 2001 From: "Sebastian H. Gabrielli" Date: Mon, 25 Dec 2023 15:51:31 +0100 Subject: [PATCH] Move index to main & make ErrorResponder public --- src/main.rs | 5 +++++ src/webserver_member.rs | 9 ++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main.rs b/src/main.rs index 845b563..1763efd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -7,6 +7,11 @@ use database::set_up_db; mod webserver_member; use webserver_member::*; +#[get("/")] +fn index() -> &'static str { + "Hello, world!\nNothing useful is served here." +} + #[launch] async fn rocket() -> _ { let db = match set_up_db().await { diff --git a/src/webserver_member.rs b/src/webserver_member.rs index 0bcbeee..28067a9 100644 --- a/src/webserver_member.rs +++ b/src/webserver_member.rs @@ -15,8 +15,8 @@ use sea_orm::*; #[derive(Responder)] #[response(status = 500, content_type = "text/plain")] -struct ErrorResponder { - message: String +pub struct ErrorResponder { + pub message: String } impl From for ErrorResponder { @@ -35,11 +35,6 @@ impl From<&str> for ErrorResponder { } } -#[get("/")] -pub fn index() -> &'static str { - "Hello, world!\nNothing useful is served here." -} - #[get("/members")] pub async fn get_members(db: &State) -> Result, ErrorResponder> { let db = db as &DatabaseConnection;