Merge pull request #74 from openhpc/2025-11-29-maxminddb

Bump maxminddb from 0.26.0 to 0.27.0

Author: adrianreber

Cargo.lock

@@ -8,7 +8,7 @@ chrono = "0.4.42"
 clap = { version = "4.3.24", features = ["derive"] }
 console = "0.16.1"
 indicatif = "0.18.3"
-maxminddb = "0.26.0"
+maxminddb = "0.27.0"
 plotly =  { version = "0.8.4", features = ["kaleido"] }
 rayon = "1.11.0"
 regex = "1.12.2"

Cargo.toml

@@ -1391,15 +1391,13 @@ fn fill_country_results(params: &Args) -> Result<(), Box<dyn std::error::Error>>
     for result in &*data {
         result.ipv4.par_iter().for_each(|(key, value)| {
             let client_country = match geoip_reader
-                .lookup::<maxminddb::geoip2::Country>(std::net::IpAddr::V4(Ipv4Addr::from(*key)))
+                .lookup(std::net::IpAddr::V4(Ipv4Addr::from(*key)))
+                .and_then(|r| r.decode::<maxminddb::geoip2::Country>())
             {
-                Ok(Some(c)) => match c.country {
-                    Some(co) => match co.iso_code {
-                        Some(iso) => iso.to_string(),
-                        _ => "N/A".to_string(),
-                    },
-                    _ => "N/A".to_string(),
-                },
+                Ok(Some(c)) => c
+                    .country
+                    .iso_code
+                    .map_or("N/A".to_string(), |iso| iso.to_string()),
                 _ => "N/A".to_string(),
             };
 
@@ -1427,15 +1425,13 @@ fn fill_country_results(params: &Args) -> Result<(), Box<dyn std::error::Error>>
         });
         result.ipv6.par_iter().for_each(|(key, value)| {
             let client_country = match geoip_reader
-                .lookup::<maxminddb::geoip2::Country>(std::net::IpAddr::V6(Ipv6Addr::from(*key)))
+                .lookup(std::net::IpAddr::V6(Ipv6Addr::from(*key)))
+                .and_then(|r| r.decode::<maxminddb::geoip2::Country>())
             {
-                Ok(Some(c)) => match c.country {
-                    Some(co) => match co.iso_code {
-                        Some(iso) => iso.to_string(),
-                        _ => "N/A".to_string(),
-                    },
-                    _ => "N/A".to_string(),
-                },
+                Ok(Some(c)) => c
+                    .country
+                    .iso_code
+                    .map_or("N/A".to_string(), |iso| iso.to_string()),
                 _ => "N/A".to_string(),
             };