From 871b8525b4741e7b4275623d5c6813713b49ecfa Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Tue, 30 Jan 2024 14:38:51 -0700 Subject: [PATCH] Fix per-env settings override (#7114) Due to a misplaced .trim(), the RELEASE_CHANNEL_NAME included the trailing newline. Release Notes: - N/A --- crates/release_channel/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/release_channel/src/lib.rs b/crates/release_channel/src/lib.rs index 06860e9af5..410b02868e 100644 --- a/crates/release_channel/src/lib.rs +++ b/crates/release_channel/src/lib.rs @@ -6,14 +6,14 @@ use std::env; pub static RELEASE_CHANNEL_NAME: Lazy = if cfg!(debug_assertions) { Lazy::new(|| { env::var("ZED_RELEASE_CHANNEL") - .unwrap_or_else(|_| include_str!("../../zed/RELEASE_CHANNEL").to_string()) + .unwrap_or_else(|_| include_str!("../../zed/RELEASE_CHANNEL").trim().to_string()) }) } else { - Lazy::new(|| include_str!("../../zed/RELEASE_CHANNEL").to_string()) + Lazy::new(|| include_str!("../../zed/RELEASE_CHANNEL").trim().to_string()) }; #[doc(hidden)] pub static RELEASE_CHANNEL: Lazy = - Lazy::new(|| match RELEASE_CHANNEL_NAME.as_str().trim() { + Lazy::new(|| match RELEASE_CHANNEL_NAME.as_str() { "dev" => ReleaseChannel::Dev, "nightly" => ReleaseChannel::Nightly, "preview" => ReleaseChannel::Preview,