From f7382165c39a8ef39e925f0b73079442dc037356 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 12 Jun 2025 19:28:11 -0400 Subject: [PATCH] Simplifying code --- src/keys.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/keys.rs b/src/keys.rs index 5f77cab..27cdbd5 100644 --- a/src/keys.rs +++ b/src/keys.rs @@ -13,12 +13,15 @@ pub const SECRET_KEY: &str = "SECRET_KEY"; pub const ROOT_DIRECTORY: &str = "ROOT_DIRECTORY"; // Environment key for icarus api url -pub const ICARUS_BASE_API_URL: &str = "ICARUS_BASE_API_URL"; +pub const ICARUS_BASE_API_URL: &'static str = "ICARUS_BASE_API_URL"; pub mod error { - pub const DB_URL: &str = "DATABASE_URL must be set in .env"; - pub const SECRET_KEY: &str = "SECRET_KEY must be set in environment file"; - pub const SECRET_MAIN_KEY: &str = "SECRET_MAIN_KEY must not be set in environment file"; - pub const ROOT_DIRECTORY: &str = "ROOT_DIRECTORY must not be set in environment file"; - pub const ICARUS_BASE_API_URL: &str = "ICARUS_BASE_API_URL must not be set in enviornment file"; + use const_format::concatcp; + + pub const GENERAL_ERROR: &str = "must not be set in enviornment file"; + pub const DB_URL: &str = concatcp!(super::DB_URL, " ", GENERAL_ERROR); + pub const SECRET_KEY: &str = concatcp!(super::SECRET_KEY, " ", GENERAL_ERROR); + pub const SECRET_MAIN_KEY: &str = concatcp!(super::SECRET_MAIN_KEY, " ", GENERAL_ERROR); + pub const ROOT_DIRECTORY: &str = concatcp!(super::ROOT_DIRECTORY, " ", GENERAL_ERROR); + pub const ICARUS_BASE_API_URL: &str = concatcp!(super::ICARUS_BASE_API_URL, " ", GENERAL_ERROR); }