Skip to content

uucore: locale: Use if let instead of match #8050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sylvestre merged 1 commit into from
Jun 3, 2025
Merged

uucore: locale: Use if let instead of match #8050

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions src/uucore/src/lib/mods/locale.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,13 +739,14 @@ invalid-syntax = This is { $missing
assert_eq!(result.unwrap(), "es-ES");

// Restore original LANG value
match original_lang {
Some(val) => unsafe {
if let Some(val) = original_lang {
unsafe {
env::set_var("LANG", val);
},
None => unsafe {
}
} else {
unsafe {
env::remove_var("LANG");
},
}
}
}

Expand All @@ -764,11 +765,12 @@ invalid-syntax = This is { $missing
assert_eq!(result.unwrap().to_string(), "en-US");

// Restore original LANG value
match original_lang {
Some(val) => unsafe {
if let Some(val) = original_lang {
unsafe {
env::set_var("LANG", val);
},
None => {} // Was already unset
}
} else {
{} // Was already unset
}
}

Expand All @@ -791,13 +793,14 @@ invalid-syntax = This is { $missing
assert_eq!(message, "Bonjour, le monde!");

// Restore original LANG value
match original_lang {
Some(val) => unsafe {
if let Some(val) = original_lang {
unsafe {
env::set_var("LANG", val);
},
None => unsafe {
}
} else {
unsafe {
env::remove_var("LANG");
},
}
}
})
.join()
Expand All @@ -823,13 +826,14 @@ invalid-syntax = This is { $missing
assert_eq!(message, "Hello, world!");

// Restore original LANG value
match original_lang {
Some(val) => unsafe {
if let Some(val) = original_lang {
unsafe {
env::set_var("LANG", val);
},
None => unsafe {
}
} else {
unsafe {
env::remove_var("LANG");
},
}
}
})
.join()
Expand Down
Loading