Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-22 05:10:29 +01:00
Revert "Add feature to enable use of Option::or
in const context"
This reverts commit fe8e043b8a
.
We want to run on stable soon, where these features are not supported
Dieser Commit ist enthalten in:
Ursprung
a1f0da638c
Commit
743ef74b30
1 geänderte Dateien mit 9 neuen und 2 gelöschten Zeilen
11
src/main.rs
11
src/main.rs
|
@ -1,5 +1,4 @@
|
||||||
#![forbid(unsafe_code)]
|
#![forbid(unsafe_code)]
|
||||||
#![feature(const_option_ext)]
|
|
||||||
#![cfg_attr(feature = "unstable", feature(ip))]
|
#![cfg_attr(feature = "unstable", feature(ip))]
|
||||||
// The recursion_limit is mainly triggered by the json!() macro.
|
// The recursion_limit is mainly triggered by the json!() macro.
|
||||||
// The more key/value pairs there are the more recursion occurs.
|
// The more key/value pairs there are the more recursion occurs.
|
||||||
|
@ -77,7 +76,15 @@ const HELP: &str = "\
|
||||||
-v, --version Prints the app version
|
-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() {
|
fn parse_args() {
|
||||||
let mut pargs = pico_args::Arguments::from_env();
|
let mut pargs = pico_args::Arguments::from_env();
|
||||||
|
|
Laden …
In neuem Issue referenzieren