Skip to content

Commit 2e11ee3

Browse files
silvanocerzasilvanocerza
authored
Merge pull request #73 from ipinfo/silvano/eng-737-update-currency-dataset-in-rust-sdk
Update Bulgaria currency from BGN to EUR
2 parents af1a390 + a3fab8e commit 2e11ee3

5 files changed

Lines changed: 45 additions & 117 deletions

File tree

‎src/data.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ lazy_static! {
542542
"BD" : { "code": "BDT" ,"symbol": "৳"},
543543
"BE" : { "code": "EUR" ,"symbol": "€"},
544544
"BF" : { "code": "XOF" ,"symbol": "CFA"},
545-
"BG" : { "code": "BGN" ,"symbol": "лв"},
545+
"BG" : { "code": "EUR" ,"symbol": "€"},
546546
"BH" : { "code": "BHD" ,"symbol": ".د.ب"},
547547
"BI" : { "code": "BIF" ,"symbol": "FBu"},
548548
"BJ" : { "code": "XOF" ,"symbol": "CFA"},

‎src/ipinfo.rs‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -139,35 +139,17 @@ impl IpInfo {
139139
base_url: config.base_url.unwrap_or_else(|| BASE_URL.to_string()),
140140
};
141141

142-
if config.defaut_countries.is_none() {
143-
ipinfo_obj.countries = COUNTRIES.clone();
144-
} else {
145-
ipinfo_obj.countries = config.defaut_countries.unwrap();
146-
}
147-
148-
if config.default_eu.is_none() {
149-
ipinfo_obj.eu = EU.clone();
150-
} else {
151-
ipinfo_obj.eu = config.default_eu.unwrap();
152-
}
153-
154-
if config.default_flags.is_none() {
155-
ipinfo_obj.country_flags = FLAGS.clone();
156-
} else {
157-
ipinfo_obj.country_flags = config.default_flags.unwrap();
158-
}
159-
160-
if config.default_currencies.is_none() {
161-
ipinfo_obj.country_currencies = CURRENCIES.clone();
162-
} else {
163-
ipinfo_obj.country_currencies = config.default_currencies.unwrap();
164-
}
165-
166-
if config.default_continents.is_none() {
167-
ipinfo_obj.continents = CONTINENTS.clone();
168-
} else {
169-
ipinfo_obj.continents = config.default_continents.unwrap();
170-
}
142+
ipinfo_obj.countries =
143+
config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone());
144+
ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone());
145+
ipinfo_obj.country_flags =
146+
config.default_flags.unwrap_or_else(|| FLAGS.clone());
147+
ipinfo_obj.country_currencies = config
148+
.default_currencies
149+
.unwrap_or_else(|| CURRENCIES.clone());
150+
ipinfo_obj.continents = config
151+
.default_continents
152+
.unwrap_or_else(|| CONTINENTS.clone());
171153

172154
Ok(ipinfo_obj)
173155
}

‎src/ipinfo_core.rs‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -112,35 +112,17 @@ impl IpInfoCore {
112112
continents: HashMap::new(),
113113
};
114114

115-
if config.defaut_countries.is_none() {
116-
ipinfo_obj.countries = COUNTRIES.clone();
117-
} else {
118-
ipinfo_obj.countries = config.defaut_countries.unwrap();
119-
}
120-
121-
if config.default_eu.is_none() {
122-
ipinfo_obj.eu = EU.clone();
123-
} else {
124-
ipinfo_obj.eu = config.default_eu.unwrap();
125-
}
126-
127-
if config.default_flags.is_none() {
128-
ipinfo_obj.country_flags = FLAGS.clone();
129-
} else {
130-
ipinfo_obj.country_flags = config.default_flags.unwrap();
131-
}
132-
133-
if config.default_currencies.is_none() {
134-
ipinfo_obj.country_currencies = CURRENCIES.clone();
135-
} else {
136-
ipinfo_obj.country_currencies = config.default_currencies.unwrap();
137-
}
138-
139-
if config.default_continents.is_none() {
140-
ipinfo_obj.continents = CONTINENTS.clone();
141-
} else {
142-
ipinfo_obj.continents = config.default_continents.unwrap();
143-
}
115+
ipinfo_obj.countries =
116+
config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone());
117+
ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone());
118+
ipinfo_obj.country_flags =
119+
config.default_flags.unwrap_or_else(|| FLAGS.clone());
120+
ipinfo_obj.country_currencies = config
121+
.default_currencies
122+
.unwrap_or_else(|| CURRENCIES.clone());
123+
ipinfo_obj.continents = config
124+
.default_continents
125+
.unwrap_or_else(|| CONTINENTS.clone());
144126

145127
Ok(ipinfo_obj)
146128
}

‎src/ipinfo_lite.rs‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -112,35 +112,17 @@ impl IpInfoLite {
112112
continents: HashMap::new(),
113113
};
114114

115-
if config.defaut_countries.is_none() {
116-
ipinfo_obj.countries = COUNTRIES.clone();
117-
} else {
118-
ipinfo_obj.countries = config.defaut_countries.unwrap();
119-
}
120-
121-
if config.default_eu.is_none() {
122-
ipinfo_obj.eu = EU.clone();
123-
} else {
124-
ipinfo_obj.eu = config.default_eu.unwrap();
125-
}
126-
127-
if config.default_flags.is_none() {
128-
ipinfo_obj.country_flags = FLAGS.clone();
129-
} else {
130-
ipinfo_obj.country_flags = config.default_flags.unwrap();
131-
}
132-
133-
if config.default_currencies.is_none() {
134-
ipinfo_obj.country_currencies = CURRENCIES.clone();
135-
} else {
136-
ipinfo_obj.country_currencies = config.default_currencies.unwrap();
137-
}
138-
139-
if config.default_continents.is_none() {
140-
ipinfo_obj.continents = CONTINENTS.clone();
141-
} else {
142-
ipinfo_obj.continents = config.default_continents.unwrap();
143-
}
115+
ipinfo_obj.countries =
116+
config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone());
117+
ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone());
118+
ipinfo_obj.country_flags =
119+
config.default_flags.unwrap_or_else(|| FLAGS.clone());
120+
ipinfo_obj.country_currencies = config
121+
.default_currencies
122+
.unwrap_or_else(|| CURRENCIES.clone());
123+
ipinfo_obj.continents = config
124+
.default_continents
125+
.unwrap_or_else(|| CONTINENTS.clone());
144126

145127
Ok(ipinfo_obj)
146128
}

‎src/ipinfo_plus.rs‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -112,35 +112,17 @@ impl IpInfoPlus {
112112
continents: HashMap::new(),
113113
};
114114

115-
if config.defaut_countries.is_none() {
116-
ipinfo_obj.countries = COUNTRIES.clone();
117-
} else {
118-
ipinfo_obj.countries = config.defaut_countries.unwrap();
119-
}
120-
121-
if config.default_eu.is_none() {
122-
ipinfo_obj.eu = EU.clone();
123-
} else {
124-
ipinfo_obj.eu = config.default_eu.unwrap();
125-
}
126-
127-
if config.default_flags.is_none() {
128-
ipinfo_obj.country_flags = FLAGS.clone();
129-
} else {
130-
ipinfo_obj.country_flags = config.default_flags.unwrap();
131-
}
132-
133-
if config.default_currencies.is_none() {
134-
ipinfo_obj.country_currencies = CURRENCIES.clone();
135-
} else {
136-
ipinfo_obj.country_currencies = config.default_currencies.unwrap();
137-
}
138-
139-
if config.default_continents.is_none() {
140-
ipinfo_obj.continents = CONTINENTS.clone();
141-
} else {
142-
ipinfo_obj.continents = config.default_continents.unwrap();
143-
}
115+
ipinfo_obj.countries =
116+
config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone());
117+
ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone());
118+
ipinfo_obj.country_flags =
119+
config.default_flags.unwrap_or_else(|| FLAGS.clone());
120+
ipinfo_obj.country_currencies = config
121+
.default_currencies
122+
.unwrap_or_else(|| CURRENCIES.clone());
123+
ipinfo_obj.continents = config
124+
.default_continents
125+
.unwrap_or_else(|| CONTINENTS.clone());
144126

145127
Ok(ipinfo_obj)
146128
}

0 commit comments

Comments
 (0)