fix clippy

This commit is contained in:
Martin Marmsoler
2026-07-13 09:32:50 +02:00
committed by Olivier Goffart
parent ca573df559
commit 066c091b56
2 changed files with 4 additions and 6 deletions

View File

@@ -22,11 +22,9 @@ pub struct XkbComposeTable {
impl XkbComposeTable {
pub fn new(context: &XkbContext) -> Option<Self> {
let locale = env::var_os("LC_ALL")
.and_then(|v| if v.is_empty() { None } else { Some(v) })
.or_else(|| env::var_os("LC_CTYPE"))
.and_then(|v| if v.is_empty() { None } else { Some(v) })
.or_else(|| env::var_os("LANG"))
.and_then(|v| if v.is_empty() { None } else { Some(v) })
.filter(|v| !v.is_empty())
.or_else(|| env::var_os("LC_CTYPE").filter(|v| !v.is_empty()))
.or_else(|| env::var_os("LANG").filter(|v| !v.is_empty()))
.unwrap_or_else(|| "C".into());
let locale = CString::new(locale.into_vec()).unwrap();