From 743ef74b307a662960f3ca1b9636f3608506516d Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 1 Jan 2022 23:08:27 +0000 Subject: [PATCH] Revert "Add feature to enable use of `Option::or` in const context" This reverts commit fe8e043b8aaf77c083747bf11760f29b53df0bba. We want to run on stable soon, where these features are not supported --- src/main.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index a0d45666..67b21322 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,4 @@ #![forbid(unsafe_code)] -#![feature(const_option_ext)] #![cfg_attr(feature = "unstable", feature(ip))] // The recursion_limit is mainly triggered by the json!() macro. // The more key/value pairs there are the more recursion occurs. @@ -77,7 +76,15 @@ const HELP: &str = "\ -v, --version Prints the app version "; -pub const VERSION: Option<&str> = option_env!("BWRS_VERSION").or(option_env!("VW_VERSION")); +// HACK: Option::or cannot be used in a constant context +const fn get_version() -> Option<&'static str> { + let bwrs_version = option_env!("BWRS_VERSION"); + match bwrs_version { + Some(_) => bwrs_version, + None => option_env!("VW_VERSION"), + } +} +pub const VERSION: Option<&str> = get_version(); fn parse_args() { let mut pargs = pico_args::Arguments::from_env();