diff --git a/Cargo.lock b/Cargo.lock index 446e835..605196f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -168,6 +168,26 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "const_format" +version = "0.2.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + [[package]] name = "crossbeam-utils" version = "0.8.21" @@ -277,9 +297,10 @@ checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08" [[package]] name = "icarus_envy" -version = "0.2.0" +version = "0.2.1" dependencies = [ "async-std", + "const_format", "dotenvy", ] @@ -458,6 +479,12 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "value-bag" version = "1.11.1" diff --git a/Cargo.toml b/Cargo.toml index d9dfe0f..03f3d99 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "icarus_envy" -version = "0.2.1" +version = "0.2.2" edition = "2024" rust-version = "1.86" [dependencies] dotenvy = { version = "0.15.7" } +const_format = { version = "0.2.34" } [dev-dependencies] async-std = { version = "1.13.1" } diff --git a/src/keys.rs b/src/keys.rs index 5f77cab..cde5fab 100644 --- a/src/keys.rs +++ b/src/keys.rs @@ -16,9 +16,12 @@ pub const ROOT_DIRECTORY: &str = "ROOT_DIRECTORY"; pub const ICARUS_BASE_API_URL: &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); }