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

Update tests

Browse Source
This commit is contained in:
Vlasislav Kashin
2025-07-13 17:30:47 +03:00
parent 03911c0572
commit 923a941473
2 changed files with 398 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/phonenumberutil/phonenumberutil.rs
View File

@@ -259,7 +259,7 @@ impl PhoneNumberUtil {
.full_match(national_prefix_formatting_rule);
}
pub fn get_ndd_prefix_for_region(&self, region_code: &str, strip_non_digits: bool) -> String {
pub fn get_ndd_prefix_for_region(&self, region_code: &str, strip_non_digits: bool) -> Option<String> {
self.region_to_metadata_map
.get(region_code)
.map(|metadata| {
@@ -269,10 +269,6 @@ impl PhoneNumberUtil {
}
prefix
})
.unwrap_or_else(|| {
warn!("Invalid or unknown region code ({}) provided.", region_code);
"".to_string()
})
}
/// 'hot' function wrapper for region_to_metadata_map.get
@@ -1185,11 +1181,10 @@ impl PhoneNumberUtil {
self.get_region_code_for_country_code(phone_number.country_code());
// We strip non-digits from the NDD here, and from the raw input later, so
// that we can compare them easily.
let national_prefix =
self.get_ndd_prefix_for_region(region_code, true /* strip non-digits */);
if national_prefix.is_empty() {
let Some(national_prefix) =
self.get_ndd_prefix_for_region(region_code, true /* strip non-digits */) else {
break 'default_block format_national()?;
}
};
let Some(metadata) = self.region_to_metadata_map.get(region_code) else {
// If the region doesn't have a national prefix at all, we can safely
// return the national format without worrying about a national prefix