From 29cbce338da945a1e322793db6562f7c2881dd3d Mon Sep 17 00:00:00 2001 From: Silvano Cerza Date: Tue, 24 Mar 2026 19:27:25 +0100 Subject: [PATCH 1/3] Update Bulgaria currency from BGN to EUR --- src/data.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data.rs b/src/data.rs index c5fdc9a..c3cd65c 100644 --- a/src/data.rs +++ b/src/data.rs @@ -542,7 +542,7 @@ lazy_static! { "BD" : { "code": "BDT" ,"symbol": "৳"}, "BE" : { "code": "EUR" ,"symbol": "€"}, "BF" : { "code": "XOF" ,"symbol": "CFA"}, - "BG" : { "code": "BGN" ,"symbol": "лв"}, + "BG" : { "code": "EUR" ,"symbol": "€"}, "BH" : { "code": "BHD" ,"symbol": ".د.ب"}, "BI" : { "code": "BIF" ,"symbol": "FBu"}, "BJ" : { "code": "XOF" ,"symbol": "CFA"}, From f43900bb05cb37d9af61cd2f624cb1594bfb71b0 Mon Sep 17 00:00:00 2001 From: Silvano Cerza Date: Wed, 25 Mar 2026 16:56:39 +0100 Subject: [PATCH 2/3] Fix linting failures --- src/ipinfo.rs | 34 +++++----------------------------- src/ipinfo_core.rs | 34 +++++----------------------------- src/ipinfo_lite.rs | 34 +++++----------------------------- src/ipinfo_plus.rs | 34 +++++----------------------------- 4 files changed, 20 insertions(+), 116 deletions(-) diff --git a/src/ipinfo.rs b/src/ipinfo.rs index 05d2abe..aaca362 100644 --- a/src/ipinfo.rs +++ b/src/ipinfo.rs @@ -139,35 +139,11 @@ impl IpInfo { base_url: config.base_url.unwrap_or_else(|| BASE_URL.to_string()), }; - if config.defaut_countries.is_none() { - ipinfo_obj.countries = COUNTRIES.clone(); - } else { - ipinfo_obj.countries = config.defaut_countries.unwrap(); - } - - if config.default_eu.is_none() { - ipinfo_obj.eu = EU.clone(); - } else { - ipinfo_obj.eu = config.default_eu.unwrap(); - } - - if config.default_flags.is_none() { - ipinfo_obj.country_flags = FLAGS.clone(); - } else { - ipinfo_obj.country_flags = config.default_flags.unwrap(); - } - - if config.default_currencies.is_none() { - ipinfo_obj.country_currencies = CURRENCIES.clone(); - } else { - ipinfo_obj.country_currencies = config.default_currencies.unwrap(); - } - - if config.default_continents.is_none() { - ipinfo_obj.continents = CONTINENTS.clone(); - } else { - ipinfo_obj.continents = config.default_continents.unwrap(); - } + ipinfo_obj.countries = config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone()); + ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone()); + ipinfo_obj.country_flags = config.default_flags.unwrap_or_else(|| FLAGS.clone()); + ipinfo_obj.country_currencies = config.default_currencies.unwrap_or_else(|| CURRENCIES.clone()); + ipinfo_obj.continents = config.default_continents.unwrap_or_else(|| CONTINENTS.clone()); Ok(ipinfo_obj) } diff --git a/src/ipinfo_core.rs b/src/ipinfo_core.rs index c9a2d72..dcbe4c7 100644 --- a/src/ipinfo_core.rs +++ b/src/ipinfo_core.rs @@ -112,35 +112,11 @@ impl IpInfoCore { continents: HashMap::new(), }; - if config.defaut_countries.is_none() { - ipinfo_obj.countries = COUNTRIES.clone(); - } else { - ipinfo_obj.countries = config.defaut_countries.unwrap(); - } - - if config.default_eu.is_none() { - ipinfo_obj.eu = EU.clone(); - } else { - ipinfo_obj.eu = config.default_eu.unwrap(); - } - - if config.default_flags.is_none() { - ipinfo_obj.country_flags = FLAGS.clone(); - } else { - ipinfo_obj.country_flags = config.default_flags.unwrap(); - } - - if config.default_currencies.is_none() { - ipinfo_obj.country_currencies = CURRENCIES.clone(); - } else { - ipinfo_obj.country_currencies = config.default_currencies.unwrap(); - } - - if config.default_continents.is_none() { - ipinfo_obj.continents = CONTINENTS.clone(); - } else { - ipinfo_obj.continents = config.default_continents.unwrap(); - } + ipinfo_obj.countries = config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone()); + ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone()); + ipinfo_obj.country_flags = config.default_flags.unwrap_or_else(|| FLAGS.clone()); + ipinfo_obj.country_currencies = config.default_currencies.unwrap_or_else(|| CURRENCIES.clone()); + ipinfo_obj.continents = config.default_continents.unwrap_or_else(|| CONTINENTS.clone()); Ok(ipinfo_obj) } diff --git a/src/ipinfo_lite.rs b/src/ipinfo_lite.rs index b81935d..6f5b3c7 100644 --- a/src/ipinfo_lite.rs +++ b/src/ipinfo_lite.rs @@ -112,35 +112,11 @@ impl IpInfoLite { continents: HashMap::new(), }; - if config.defaut_countries.is_none() { - ipinfo_obj.countries = COUNTRIES.clone(); - } else { - ipinfo_obj.countries = config.defaut_countries.unwrap(); - } - - if config.default_eu.is_none() { - ipinfo_obj.eu = EU.clone(); - } else { - ipinfo_obj.eu = config.default_eu.unwrap(); - } - - if config.default_flags.is_none() { - ipinfo_obj.country_flags = FLAGS.clone(); - } else { - ipinfo_obj.country_flags = config.default_flags.unwrap(); - } - - if config.default_currencies.is_none() { - ipinfo_obj.country_currencies = CURRENCIES.clone(); - } else { - ipinfo_obj.country_currencies = config.default_currencies.unwrap(); - } - - if config.default_continents.is_none() { - ipinfo_obj.continents = CONTINENTS.clone(); - } else { - ipinfo_obj.continents = config.default_continents.unwrap(); - } + ipinfo_obj.countries = config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone()); + ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone()); + ipinfo_obj.country_flags = config.default_flags.unwrap_or_else(|| FLAGS.clone()); + ipinfo_obj.country_currencies = config.default_currencies.unwrap_or_else(|| CURRENCIES.clone()); + ipinfo_obj.continents = config.default_continents.unwrap_or_else(|| CONTINENTS.clone()); Ok(ipinfo_obj) } diff --git a/src/ipinfo_plus.rs b/src/ipinfo_plus.rs index 0eb1986..8e7fe62 100644 --- a/src/ipinfo_plus.rs +++ b/src/ipinfo_plus.rs @@ -112,35 +112,11 @@ impl IpInfoPlus { continents: HashMap::new(), }; - if config.defaut_countries.is_none() { - ipinfo_obj.countries = COUNTRIES.clone(); - } else { - ipinfo_obj.countries = config.defaut_countries.unwrap(); - } - - if config.default_eu.is_none() { - ipinfo_obj.eu = EU.clone(); - } else { - ipinfo_obj.eu = config.default_eu.unwrap(); - } - - if config.default_flags.is_none() { - ipinfo_obj.country_flags = FLAGS.clone(); - } else { - ipinfo_obj.country_flags = config.default_flags.unwrap(); - } - - if config.default_currencies.is_none() { - ipinfo_obj.country_currencies = CURRENCIES.clone(); - } else { - ipinfo_obj.country_currencies = config.default_currencies.unwrap(); - } - - if config.default_continents.is_none() { - ipinfo_obj.continents = CONTINENTS.clone(); - } else { - ipinfo_obj.continents = config.default_continents.unwrap(); - } + ipinfo_obj.countries = config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone()); + ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone()); + ipinfo_obj.country_flags = config.default_flags.unwrap_or_else(|| FLAGS.clone()); + ipinfo_obj.country_currencies = config.default_currencies.unwrap_or_else(|| CURRENCIES.clone()); + ipinfo_obj.continents = config.default_continents.unwrap_or_else(|| CONTINENTS.clone()); Ok(ipinfo_obj) } From a3fab8e7cd4ce1fd06c71c9d933ebe68068e2f54 Mon Sep 17 00:00:00 2001 From: Silvano Cerza Date: Wed, 25 Mar 2026 17:02:15 +0100 Subject: [PATCH 3/3] Fix formatting --- src/ipinfo.rs | 14 ++++++++++---- src/ipinfo_core.rs | 14 ++++++++++---- src/ipinfo_lite.rs | 14 ++++++++++---- src/ipinfo_plus.rs | 14 ++++++++++---- 4 files changed, 40 insertions(+), 16 deletions(-) diff --git a/src/ipinfo.rs b/src/ipinfo.rs index aaca362..1eb4c04 100644 --- a/src/ipinfo.rs +++ b/src/ipinfo.rs @@ -139,11 +139,17 @@ impl IpInfo { base_url: config.base_url.unwrap_or_else(|| BASE_URL.to_string()), }; - ipinfo_obj.countries = config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone()); + ipinfo_obj.countries = + config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone()); ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone()); - ipinfo_obj.country_flags = config.default_flags.unwrap_or_else(|| FLAGS.clone()); - ipinfo_obj.country_currencies = config.default_currencies.unwrap_or_else(|| CURRENCIES.clone()); - ipinfo_obj.continents = config.default_continents.unwrap_or_else(|| CONTINENTS.clone()); + ipinfo_obj.country_flags = + config.default_flags.unwrap_or_else(|| FLAGS.clone()); + ipinfo_obj.country_currencies = config + .default_currencies + .unwrap_or_else(|| CURRENCIES.clone()); + ipinfo_obj.continents = config + .default_continents + .unwrap_or_else(|| CONTINENTS.clone()); Ok(ipinfo_obj) } diff --git a/src/ipinfo_core.rs b/src/ipinfo_core.rs index dcbe4c7..4126b6f 100644 --- a/src/ipinfo_core.rs +++ b/src/ipinfo_core.rs @@ -112,11 +112,17 @@ impl IpInfoCore { continents: HashMap::new(), }; - ipinfo_obj.countries = config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone()); + ipinfo_obj.countries = + config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone()); ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone()); - ipinfo_obj.country_flags = config.default_flags.unwrap_or_else(|| FLAGS.clone()); - ipinfo_obj.country_currencies = config.default_currencies.unwrap_or_else(|| CURRENCIES.clone()); - ipinfo_obj.continents = config.default_continents.unwrap_or_else(|| CONTINENTS.clone()); + ipinfo_obj.country_flags = + config.default_flags.unwrap_or_else(|| FLAGS.clone()); + ipinfo_obj.country_currencies = config + .default_currencies + .unwrap_or_else(|| CURRENCIES.clone()); + ipinfo_obj.continents = config + .default_continents + .unwrap_or_else(|| CONTINENTS.clone()); Ok(ipinfo_obj) } diff --git a/src/ipinfo_lite.rs b/src/ipinfo_lite.rs index 6f5b3c7..9d0bf72 100644 --- a/src/ipinfo_lite.rs +++ b/src/ipinfo_lite.rs @@ -112,11 +112,17 @@ impl IpInfoLite { continents: HashMap::new(), }; - ipinfo_obj.countries = config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone()); + ipinfo_obj.countries = + config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone()); ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone()); - ipinfo_obj.country_flags = config.default_flags.unwrap_or_else(|| FLAGS.clone()); - ipinfo_obj.country_currencies = config.default_currencies.unwrap_or_else(|| CURRENCIES.clone()); - ipinfo_obj.continents = config.default_continents.unwrap_or_else(|| CONTINENTS.clone()); + ipinfo_obj.country_flags = + config.default_flags.unwrap_or_else(|| FLAGS.clone()); + ipinfo_obj.country_currencies = config + .default_currencies + .unwrap_or_else(|| CURRENCIES.clone()); + ipinfo_obj.continents = config + .default_continents + .unwrap_or_else(|| CONTINENTS.clone()); Ok(ipinfo_obj) } diff --git a/src/ipinfo_plus.rs b/src/ipinfo_plus.rs index 8e7fe62..1781e9f 100644 --- a/src/ipinfo_plus.rs +++ b/src/ipinfo_plus.rs @@ -112,11 +112,17 @@ impl IpInfoPlus { continents: HashMap::new(), }; - ipinfo_obj.countries = config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone()); + ipinfo_obj.countries = + config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone()); ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone()); - ipinfo_obj.country_flags = config.default_flags.unwrap_or_else(|| FLAGS.clone()); - ipinfo_obj.country_currencies = config.default_currencies.unwrap_or_else(|| CURRENCIES.clone()); - ipinfo_obj.continents = config.default_continents.unwrap_or_else(|| CONTINENTS.clone()); + ipinfo_obj.country_flags = + config.default_flags.unwrap_or_else(|| FLAGS.clone()); + ipinfo_obj.country_currencies = config + .default_currencies + .unwrap_or_else(|| CURRENCIES.clone()); + ipinfo_obj.continents = config + .default_continents + .unwrap_or_else(|| CONTINENTS.clone()); Ok(ipinfo_obj) }