diff --git a/base/src/expressions/parser/static_analysis.rs b/base/src/expressions/parser/static_analysis.rs index 0a87447..850d662 100644 --- a/base/src/expressions/parser/static_analysis.rs +++ b/base/src/expressions/parser/static_analysis.rs @@ -5,11 +5,12 @@ use super::Node; use regex::Regex; use std::sync::OnceLock; -static RE: OnceLock = OnceLock::new(); +static RANGE_REFERENCE_REGEX: OnceLock = OnceLock::new(); #[allow(clippy::expect_used)] fn get_re() -> &'static Regex { - RE.get_or_init(|| Regex::new(r":[A-Z]*[0-9]*$").expect("Regex is known to be valid")) + RANGE_REFERENCE_REGEX + .get_or_init(|| Regex::new(r":[A-Z]*[0-9]*$").expect("Regex is known to be valid")) } fn is_range_reference(s: &str) -> bool { diff --git a/base/src/locale/mod.rs b/base/src/locale/mod.rs index fe584a6..bbc62da 100644 --- a/base/src/locale/mod.rs +++ b/base/src/locale/mod.rs @@ -76,5 +76,5 @@ fn get_locales() -> &'static HashMap { pub fn get_locale(id: &str) -> Result<&Locale, String> { get_locales() .get(id) - .ok_or_else(|| "Invalid locale".to_string()) + .ok_or_else(|| format!("Invalid locale: '{id}'")) }