Added Database::iter(), docs, DB update, deps bump.

.github/workflows/check.yml

@@ -0,0 +1,22 @@
+name: Check
+on:
+  pull_request:
+    paths:
+        - assets/**
+
+jobs:
+    check_database_update:
+        name: Check libphonenumber database update
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+            - name: Update assets
+              run: ./assets/update.sh
+            - name: Check git status
+              run: |
+                if [[ -n "$(git status --porcelain=v2)" ]];
+                then
+                    echo "Found untracked or uncommitted files after updating the libphonenumber database, failing."
+                    exit 1
+                fi

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "phonenumber"
-version = "0.3.4+8.13.34"
+version = "0.3.5+8.13.35"
 edition = "2021"
 rust-version = "1.58.0"
 
@@ -14,33 +14,33 @@ readme = "README.md"
 
 [dependencies]
 bincode = "1.3"
-either = "1.8"
-fnv = "1.0"
-lazy_static = "1.4"
+either = "1.11"
+fnv = "1"
 itertools = ">=0.10, <= 0.12"
+lazy_static = "1.4"
 nom = "7.1"
 quick-xml = ">=0.28, <= 0.31"
-regex = "1.7"
+regex = "1.10"
 regex-cache = "0.2"
 serde = "1.0"
 serde_derive = "1.0"
-strum = { version = ">=0.24, <=0.25", features = ["derive"] }
+strum = { version = ">=0.24, <=0.26", features = ["derive"] }
 thiserror = "1.0"
 
 [build-dependencies]
-bincode = "1.3"
+bincode = "1.0.1"
 quick-xml = ">=0.28, <=0.31"
-regex = "1.7"
+regex = "1.10"
 serde = "1.0"
 serde_derive = "1.0"
 thiserror = "1.0"
 
 [dev-dependencies]
-doc-comment = "0.3"
-rstest = ">= 0.13, <=0.18"
-rstest_reuse = "0.6"
 anyhow = "1"
 criterion = ">=0.4, <=0.5"
+doc-comment = "0.3"
+rstest = ">= 0.13, <=0.19"
+rstest_reuse = "0.6"
 
 [[bench]]
 name = "parsing"

assets/PhoneNumberMetadata.xml

@@ -5721,7 +5721,7 @@
         <nationalNumberPattern>
           88\d{5}|
           (?:
-            8[0-59]|
+            8[0-69]|
             9[017-9]
           )\d{7}
         </nationalNumberPattern>
@@ -11177,15 +11177,14 @@
               )|
               1(?:
                 1(?:
-                  00|
-                  [124]\d|
-                  3[01]
+                  [03][01]|
+                  [124]\d
                 )|
                 4\d\d
               )|
               (?:
                 44|
-                68
+                6[89]
               )\d\d|
               5(?:
                 [0157-9]\d\d|
@@ -12421,7 +12420,7 @@
             6\d\d|
             7(?:
               [01]\d|
-              2[156]|
+              2[1256]|
               3[12]|
               49
             )
@@ -18251,14 +18250,19 @@
       </fixedLine>
       <!-- Adding 202[89], 205[289], 207[68] and 209[135-7] from numbers found online. -->
       <mobile>
-        <possibleLengths national="10"/>
+        <possibleLengths national="9,10"/>
         <exampleNumber>2023123456</exampleNumber>
         <nationalNumberPattern>
-          2088\d{6}|
           (?:
-            20[23579]|
-            302
-          )\d{7}
+            20(?:
+              [23579]\d|
+              88
+            )|
+            30(?:
+              2\d|
+              4
+            )
+          )\d{6}
         </nationalNumberPattern>
       </mobile>
       <!-- The Lonely Planet says that newer WIN phones (fixed phones without a physical landline)
@@ -18267,7 +18271,7 @@
       <uan>
         <possibleLengths national="9"/>
         <exampleNumber>301234567</exampleNumber>
-        <nationalNumberPattern>30[013-9]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>30[0135-9]\d{6}</nationalNumberPattern>
       </uan>
     </territory>
 
@@ -24507,8 +24511,8 @@
               9\d
             )|
             [35]92(?:
-              3[034]|
-              9\d
+              [049]\d|
+              3[034]
             )
           )\d{3}|
           (?:
@@ -24597,7 +24601,11 @@
         <exampleNumber>600110000</exampleNumber>
         <nationalNumberPattern>
           600\d{6}|
-          6[06]923[34]\d{3}
+          6[06]92(?:
+            0\d|
+            3[349]|
+            49
+          )\d{3}
         </nationalNumberPattern>
       </voicemail>
     </territory>
@@ -25082,8 +25090,8 @@
           7020\d{5}|
           (?:
             6(?:
-              2\d|
-              40
+              [04]0|
+              2\d
             )|
             7(?:
               0[013-9]|
@@ -26142,9 +26150,9 @@
         <exampleNumber>81234567</exampleNumber>
         <nationalNumberPattern>
           8(?:
-            09|
-            95
-          )[0-2]\d{4}|
+            09[0-24]|
+            95[0-2]
+          )\d{4}|
           (?:
             8(?:
               0[1-8]|
@@ -27485,7 +27493,7 @@
         <exampleNumber>63012345</exampleNumber>
         <nationalNumberPattern>
           (?:
-            6[0235689]|
+            6[0-689]|
             77|
             9\d
           )\d{6}

assets/carrier/en/235.txt

@@ -12,11 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-23560|Airtel
-23562|Airtel
-23563|Airtel
-23565|Airtel
-23566|Airtel
-23568|Airtel
+2356|Airtel
 2357|Sotel
 2359|Tigo

assets/carrier/en/243.txt

@@ -18,6 +18,7 @@
 24383|Vodacom
 24384|Orange
 24385|Orange
+24386|Vodacom
 24388|Yozma Timeturns sprl -YTT
 24389|Orange
 24390|Africell

assets/carrier/en/244.txt

@@ -16,5 +16,5 @@
 24492|UNITEL
 24493|UNITEL
 24494|UNITEL
-24495|Africell Angola
+24495|Africell
 24499|Movicel

assets/carrier/en/351.txt

@@ -19,14 +19,18 @@
 351609230|NOS
 35160929|NOS
 3516093|NOS
+35163920|Lycamobile
 351639230|NOS
 351639233|Digi Communications
 351639234|G9 Telecom
+35163924|MEO
 35163929|NOS
 3516393|NOS
+35165920|Lycamobile
 351659230|NOS
 351659233|Digi Communications
 351659234|G9 Telecom
+35165924|MEO
 35165929|NOS
 3516593|NOS
 351669230|NOS
@@ -39,6 +43,7 @@
 3519203|Lycamobile
 3519204|Lycamobile
 3519205|Lycamobile
+3519208|Lycamobile
 351921|Vodafone
 3519220|Vodafone
 3519221|MEO

assets/carrier/en/40.txt

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+4060|Telekom
 4062|Vodafone
 4064|Orange
 407000|Enigma-System

assets/carrier/en/592.txt

@@ -50,6 +50,9 @@
 592708|GTT
 592709|GTT
 59271|E-Networks
-59272|GTT
+592721|GTT
+592722|Digicel Guyana
+592725|GTT
+592726|GTT
 59273|E-Networks
 59274|GTT

assets/carrier/en/65.txt

@@ -61,6 +61,7 @@
 658090|SingTel
 658091|M1
 658092|Simba
+658094|M1
 6581|StarHub
 65810|M1
 65812|SingTel

assets/carrier/en/856.txt

@@ -19,3 +19,4 @@
 856208|Best Telecom
 856209|Unitel
 856302|ETL
+856304|Unitel

assets/carrier/en/995.txt

@@ -42,6 +42,7 @@
 9955055|MagtiCom
 995510|Silknet
 99551100|MagtiCom
+99551101|Silknet
 99551107|Silknet
 9955111|MagtiCom
 9955112|MagtiCom

assets/geocoding/de/49.txt

@@ -332,7 +332,7 @@
 492623|Ransbach-Baumbach
 492624|Höhr-Grenzhausen
 492625|Ochtendung
-492626|Selters Westferwald
+492626|Selters Westerwald
 492627|Braubach
 492628|Rhens
 492630|Mülheim-Kärlich

assets/geocoding/en/49.txt

@@ -331,7 +331,7 @@
 492623|Ransbach-Baumbach
 492624|Höhr-Grenzhausen
 492625|Ochtendung
-492626|Selters Westferwald
+492626|Selters Westerwald
 492627|Braubach
 492628|Rhens
 492630|Mülheim-Kärlich

assets/update.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 set -eu
+cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd
 
-GIT_REF=v8.13.34
+GIT_REF=v8.13.35
 TMP_CLONE_DIR=$(mktemp -d)
 trap 'rm -rf "$TMP_CLONE_DIR"' EXIT
 

src/metadata/database.rs

@@ -25,6 +25,7 @@ use regex_cache::{CachedRegex, CachedRegexBuilder, RegexCache};
 
 use crate::error;
 use crate::metadata::loader;
+use crate::Metadata;
 
 const DATABASE: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/database.bin"));
 
@@ -258,4 +259,9 @@ impl Database {
             .get(code)
             .map(|m| m.iter().map(AsRef::as_ref).collect())
     }
+
+    /// Iterator over all `Metadata` entries in this database.
+    pub fn iter(&self) -> impl Iterator<Item = &Metadata> {
+        self.by_id.values().map(AsRef::as_ref)
+    }
 }