Skip to content

Commit f43900b

Browse files
silvanocerzasilvanocerza
committed
Fix linting failures
1 parent 29cbce3 commit f43900b

File tree

4 files changed

+20
-116
lines changed

4 files changed

+20
-116
lines changed

‎src/ipinfo.rs‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -139,35 +139,11 @@ 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 = config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone());
143+
ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone());
144+
ipinfo_obj.country_flags = config.default_flags.unwrap_or_else(|| FLAGS.clone());
145+
ipinfo_obj.country_currencies = config.default_currencies.unwrap_or_else(|| CURRENCIES.clone());
146+
ipinfo_obj.continents = config.default_continents.unwrap_or_else(|| CONTINENTS.clone());
171147

172148
Ok(ipinfo_obj)
173149
}

‎src/ipinfo_core.rs‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -112,35 +112,11 @@ 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 = config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone());
116+
ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone());
117+
ipinfo_obj.country_flags = config.default_flags.unwrap_or_else(|| FLAGS.clone());
118+
ipinfo_obj.country_currencies = config.default_currencies.unwrap_or_else(|| CURRENCIES.clone());
119+
ipinfo_obj.continents = config.default_continents.unwrap_or_else(|| CONTINENTS.clone());
144120

145121
Ok(ipinfo_obj)
146122
}

‎src/ipinfo_lite.rs‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -112,35 +112,11 @@ 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 = config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone());
116+
ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone());
117+
ipinfo_obj.country_flags = config.default_flags.unwrap_or_else(|| FLAGS.clone());
118+
ipinfo_obj.country_currencies = config.default_currencies.unwrap_or_else(|| CURRENCIES.clone());
119+
ipinfo_obj.continents = config.default_continents.unwrap_or_else(|| CONTINENTS.clone());
144120

145121
Ok(ipinfo_obj)
146122
}

‎src/ipinfo_plus.rs‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -112,35 +112,11 @@ 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 = config.defaut_countries.unwrap_or_else(|| COUNTRIES.clone());
116+
ipinfo_obj.eu = config.default_eu.unwrap_or_else(|| EU.clone());
117+
ipinfo_obj.country_flags = config.default_flags.unwrap_or_else(|| FLAGS.clone());
118+
ipinfo_obj.country_currencies = config.default_currencies.unwrap_or_else(|| CURRENCIES.clone());
119+
ipinfo_obj.continents = config.default_continents.unwrap_or_else(|| CONTINENTS.clone());
144120

145121
Ok(ipinfo_obj)
146122
}

0 commit comments

Comments
 (0)