From c6e6eb0af34e355dda411cfcd84104e8cf490288 Mon Sep 17 00:00:00 2001 From: strawberry Date: Sat, 4 May 2024 10:50:03 -0400 Subject: [PATCH] ignore empty CONDUWUIT_VERSION_EXTRA for server version Signed-off-by: strawberry --- src/utils/mod.rs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/utils/mod.rs b/src/utils/mod.rs index ab472b28..11a2ed3b 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -197,9 +197,21 @@ impl fmt::Display for HtmlEscape<'_> { /// git commit hashes. pub(crate) fn conduwuit_version() -> String { match option_env!("CONDUWUIT_VERSION_EXTRA") { - Some(extra) => format!("{} ({})", env!("CARGO_PKG_VERSION"), extra), + Some(extra) => { + if extra.is_empty() { + env!("CARGO_PKG_VERSION").to_owned() + } else { + format!("{} ({})", env!("CARGO_PKG_VERSION"), extra) + } + }, None => match option_env!("CONDUIT_VERSION_EXTRA") { - Some(extra) => format!("{} ({})", env!("CARGO_PKG_VERSION"), extra), + Some(extra) => { + if extra.is_empty() { + env!("CARGO_PKG_VERSION").to_owned() + } else { + format!("{} ({})", env!("CARGO_PKG_VERSION"), extra) + } + }, None => env!("CARGO_PKG_VERSION").to_owned(), }, }