Skip to content

Commit 1649eaf

Browse files
committed
style: fix rustfmt
1 parent e83f0ae commit 1649eaf

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

generate_country_data/src/codegen.rs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ impl CountryMethod {
6262
| Self::Continents => ("self", "&Self"),
6363
Self::FromStr | Self::FromCountryCode | Self::CountryCode3FromCountryCode2 => {
6464
("s", "&str")
65-
},
65+
}
6666
}
6767
}
6868

@@ -90,7 +90,7 @@ impl CountryMethod {
9090
| Self::Continents => " }\n }\n",
9191
Self::FromStr | Self::FromCountryCode | Self::CountryCode3FromCountryCode2 => {
9292
" _ => None\n }\n }\n"
93-
},
93+
}
9494
}
9595
}
9696

@@ -107,149 +107,149 @@ impl CountryMethod {
107107
.as_ref()
108108
.map_or_else(|| "None".to_owned(), |d| format!("Some(r###\"{d}\"###)"))
109109
)
110-
},
110+
}
111111
Self::CountryName => {
112112
format!(
113113
" {} => r###\"{}\"###,\n",
114114
format_args!("Self::{}", parts.enum_name),
115115
parts.country_name
116116
)
117-
},
117+
}
118118
Self::CountryCode3 => {
119119
format!(
120120
" {} => r###\"{}\"###,\n",
121121
format_args!("Self::{}", parts.enum_name),
122122
parts.country_code3
123123
)
124-
},
124+
}
125125
Self::DialingCode => {
126126
format!(
127127
" {} => r###\"{}\"###,\n",
128128
format_args!("Self::{}", parts.enum_name),
129129
parts.dialing_code
130130
)
131-
},
131+
}
132132
Self::DrivingSide => {
133133
format!(
134134
" {} => r###\"{}\"###,\n",
135135
format_args!("Self::{}", parts.enum_name),
136136
parts.driving_side
137137
)
138-
},
138+
}
139139
Self::CountryCode2 => {
140140
format!(
141141
" {} => r###\"{}\"###,\n",
142142
format_args!("Self::{}", parts.enum_name),
143143
parts.country_code2
144144
)
145-
},
145+
}
146146
Self::TopLevelDomain => {
147147
format!(
148148
" {} => &[{}],\n",
149149
format_args!("Self::{}", parts.enum_name),
150150
parts.top_level_domains.join(", ")
151151
)
152-
},
152+
}
153153
Self::Currencies => {
154154
format!(
155155
" {} => &[{}],\n",
156156
format_args!("Self::{}", parts.enum_name),
157157
parts.currencies
158158
)
159-
},
159+
}
160160
Self::Languages => {
161161
format!(
162162
" {} => &[{}],\n",
163163
format_args!("Self::{}", parts.enum_name),
164164
parts.languages
165165
)
166-
},
166+
}
167167
Self::Capital => {
168168
format!(
169169
" {} => &[{}],\n",
170170
format_args!("Self::{}", parts.enum_name),
171171
parts.capital.join(", ")
172172
)
173-
},
173+
}
174174
Self::Palette => {
175175
format!(
176176
" {} => {},\n",
177177
format_args!("Self::{}", parts.enum_name),
178178
parts.flag_colors
179179
)
180-
},
180+
}
181181
Self::Neighbours => {
182182
format!(
183183
" {} => &[{}],\n",
184184
format_args!("Self::{}", parts.enum_name),
185185
parts.neighbours.join(", ")
186186
)
187-
},
187+
}
188188
Self::AreaKm => {
189189
format!(
190190
" {} => {}_f64,\n",
191191
format_args!("Self::{}", parts.enum_name),
192192
parts.area_km
193193
)
194-
},
194+
}
195195
Self::BrightestColor => {
196196
format!(
197197
" {} => {},\n",
198198
format_args!("Self::{}", parts.enum_name),
199199
parts.most_colorful_flag_color
200200
)
201-
},
201+
}
202202
Self::Emoji => {
203203
format!(
204204
" {} => r###\"{}\"###,\n",
205205
format_args!("Self::{}", parts.enum_name),
206206
parts.emoji
207207
)
208-
},
208+
}
209209
Self::Population => {
210210
format!(
211211
" {} => {}_u64,\n",
212212
format_args!("Self::{}", parts.enum_name),
213213
parts.population
214214
)
215-
},
215+
}
216216
Self::Continents => {
217217
format!(
218218
" {} => &[{}],\n",
219219
format_args!("Self::{}", parts.enum_name),
220220
parts.continents.join(", ")
221221
)
222-
},
222+
}
223223
Self::FromStr => {
224224
format!(
225225
" \"{}\" => Some(Self::{}),\n",
226226
parts.deunicoded_name, parts.enum_name
227227
)
228-
},
228+
}
229229
Self::FromCountryCode => {
230230
format!(
231231
" \"{}\" => Some(Self::{}),\n",
232232
parts.country_code3, parts.enum_name
233233
)
234-
},
234+
}
235235
Self::CountryCode3FromCountryCode2 => {
236236
format!(
237237
" \"{}\" => Some(\"{}\"),\n",
238238
parts.country_code2, parts.country_code3
239239
)
240-
},
240+
}
241241
Self::Flag => {
242242
format!(
243243
" Country::{} => r###\"{}\"###,\n",
244244
parts.enum_name, parts.flag_color
245245
)
246-
},
246+
}
247247
Self::FlagNoColor => {
248248
format!(
249249
" Country::{} => r###\"{}\"###,\n",
250250
parts.enum_name, parts.flag_nocolor
251251
)
252-
},
252+
}
253253
}
254254
}
255255

@@ -272,7 +272,7 @@ impl CountryMethod {
272272
Self::Population => "u64",
273273
Self::Continents | Self::TopLevelDomain | Self::Neighbours | Self::Capital => {
274274
"&'static [&'static str]"
275-
},
275+
}
276276
Self::FromStr | Self::FromCountryCode => "Option<Self>",
277277
Self::CountryCode3FromCountryCode2 | Self::Description => "Option<&'static str>",
278278
}

0 commit comments

Comments
 (0)