vkashin/libphonenumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better None handling: Remove unwrap

Browse Source
This commit is contained in:
Vlasislav Kashin
2025-07-10 12:50:12 +03:00
parent 457bb65b9a
commit e72187d2d7
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/phonenumberutil/phonenumberutil.rs
View File

@@ -2319,12 +2319,15 @@ impl PhoneNumberUtil {
let first_capture = captures.as_ref().and_then(| c | c.get(1)); let first_capture = captures.as_ref().and_then(| c | c.get(1));
let second_capture = captures.as_ref().and_then(| c | c.get(2)); let second_capture = captures.as_ref().and_then(| c | c.get(2));
if !transform_rule.is_empty() && let condition = |first_capture: &regex::Match<'_>| {
(second_capture.is_some_and(| c | !c.is_empty() && first_capture.is_some()) !transform_rule.is_empty() &&
|| first_capture.is_some_and(| c | !c.is_empty() && second_capture.is_none())) { (second_capture.is_some_and(| c | !c.is_empty()) ||
!first_capture.is_empty() && second_capture.is_none())
};
if let Some(first_capture) = first_capture.filter(condition) {
// here we can safe unwrap because first_capture.is_some() anyway // here we can safe unwrap because first_capture.is_some() anyway
let first_capture = first_capture.unwrap();
let carrier_code_temp = if second_capture.is_some() { let carrier_code_temp = if second_capture.is_some() {
Some(first_capture.as_str()) Some(first_capture.as_str())
} else { } else {