Skip to content

Commit e51022d

Browse files
danieleadesdanieleades
committed
style!: use inline format args in generated code
1 parent d40dbf3 commit e51022d

18 files changed

+159
-162
lines changed

‎cargo-typify/tests/outputs/builder.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ pub mod builder {
238238
{
239239
self.veggie_like = value
240240
.try_into()
241-
.map_err(|e| format!("error converting supplied value for veggie_like: {}", e));
241+
.map_err(|e| format!("error converting supplied value for veggie_like: {e}"));
242242
self
243243
}
244244
pub fn veggie_name<T>(mut self, value: T) -> Self
@@ -248,7 +248,7 @@ pub mod builder {
248248
{
249249
self.veggie_name = value
250250
.try_into()
251-
.map_err(|e| format!("error converting supplied value for veggie_name: {}", e));
251+
.map_err(|e| format!("error converting supplied value for veggie_name: {e}"));
252252
self
253253
}
254254
}
@@ -291,7 +291,7 @@ pub mod builder {
291291
{
292292
self.fruits = value
293293
.try_into()
294-
.map_err(|e| format!("error converting supplied value for fruits: {}", e));
294+
.map_err(|e| format!("error converting supplied value for fruits: {e}"));
295295
self
296296
}
297297
pub fn vegetables<T>(mut self, value: T) -> Self
@@ -301,7 +301,7 @@ pub mod builder {
301301
{
302302
self.vegetables = value
303303
.try_into()
304-
.map_err(|e| format!("error converting supplied value for vegetables: {}", e));
304+
.map_err(|e| format!("error converting supplied value for vegetables: {e}"));
305305
self
306306
}
307307
}

‎cargo-typify/tests/outputs/custom_btree_map.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ pub mod builder {
239239
{
240240
self.veggie_like = value
241241
.try_into()
242-
.map_err(|e| format!("error converting supplied value for veggie_like: {}", e));
242+
.map_err(|e| format!("error converting supplied value for veggie_like: {e}"));
243243
self
244244
}
245245
pub fn veggie_name<T>(mut self, value: T) -> Self
@@ -249,7 +249,7 @@ pub mod builder {
249249
{
250250
self.veggie_name = value
251251
.try_into()
252-
.map_err(|e| format!("error converting supplied value for veggie_name: {}", e));
252+
.map_err(|e| format!("error converting supplied value for veggie_name: {e}"));
253253
self
254254
}
255255
}
@@ -292,7 +292,7 @@ pub mod builder {
292292
{
293293
self.fruits = value
294294
.try_into()
295-
.map_err(|e| format!("error converting supplied value for fruits: {}", e));
295+
.map_err(|e| format!("error converting supplied value for fruits: {e}"));
296296
self
297297
}
298298
pub fn vegetables<T>(mut self, value: T) -> Self
@@ -302,7 +302,7 @@ pub mod builder {
302302
{
303303
self.vegetables = value
304304
.try_into()
305-
.map_err(|e| format!("error converting supplied value for vegetables: {}", e));
305+
.map_err(|e| format!("error converting supplied value for vegetables: {e}"));
306306
self
307307
}
308308
}

‎typify-impl/src/type_entry.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ impl TypeEntry {
11471147
prop_doc.push(prop.description.as_ref().map(|d| quote! { #[doc = #d] }));
11481148
prop_name.push(format_ident!("{}", prop.name));
11491149
prop_error.push(format!(
1150-
"error converting supplied value for {}: {{}}",
1150+
"error converting supplied value for {}: {{e}}",
11511151
prop.name,
11521152
));
11531153

@@ -1311,7 +1311,7 @@ impl TypeEntry {
13111311
T::Error: ::std::fmt::Display,
13121312
{
13131313
self.#prop_name = value.try_into()
1314-
.map_err(|e| format!(#prop_error, e));
1314+
.map_err(|e| format!(#prop_error));
13151315
self
13161316
}
13171317
)*

‎typify-impl/tests/generator.out‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ mod types {
256256
{
257257
self.ok = value
258258
.try_into()
259-
.map_err(|e| format!("error converting supplied value for ok: {}", e));
259+
.map_err(|e| format!("error converting supplied value for ok: {e}"));
260260
self
261261
}
262262
}
@@ -294,7 +294,7 @@ mod types {
294294
{
295295
self.value1 = value
296296
.try_into()
297-
.map_err(|e| format!("error converting supplied value for value1: {}", e));
297+
.map_err(|e| format!("error converting supplied value for value1: {e}"));
298298
self
299299
}
300300
pub fn value2<T>(mut self, value: T) -> Self
@@ -304,7 +304,7 @@ mod types {
304304
{
305305
self.value2 = value
306306
.try_into()
307-
.map_err(|e| format!("error converting supplied value for value2: {}", e));
307+
.map_err(|e| format!("error converting supplied value for value2: {e}"));
308308
self
309309
}
310310
}
@@ -348,7 +348,7 @@ mod types {
348348
{
349349
self.a = value
350350
.try_into()
351-
.map_err(|e| format!("error converting supplied value for a: {}", e));
351+
.map_err(|e| format!("error converting supplied value for a: {e}"));
352352
self
353353
}
354354
pub fn b<T>(mut self, value: T) -> Self
@@ -358,7 +358,7 @@ mod types {
358358
{
359359
self.b = value
360360
.try_into()
361-
.map_err(|e| format!("error converting supplied value for b: {}", e));
361+
.map_err(|e| format!("error converting supplied value for b: {e}"));
362362
self
363363
}
364364
}

‎typify/tests/schemas/deny-list.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ pub mod builder {
209209
{
210210
self.where_not = value
211211
.try_into()
212-
.map_err(|e| format!("error converting supplied value for where_not: {}", e));
212+
.map_err(|e| format!("error converting supplied value for where_not: {e}"));
213213
self
214214
}
215215
pub fn why_not<T>(mut self, value: T) -> Self
@@ -219,7 +219,7 @@ pub mod builder {
219219
{
220220
self.why_not = value
221221
.try_into()
222-
.map_err(|e| format!("error converting supplied value for why_not: {}", e));
222+
.map_err(|e| format!("error converting supplied value for why_not: {e}"));
223223
self
224224
}
225225
}

‎typify/tests/schemas/extraneous-enum.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ pub mod builder {
172172
{
173173
self.letter = value
174174
.try_into()
175-
.map_err(|e| format!("error converting supplied value for letter: {}", e));
175+
.map_err(|e| format!("error converting supplied value for letter: {e}"));
176176
self
177177
}
178178
}

‎typify/tests/schemas/merged-schemas.rs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1554,7 +1554,7 @@ pub mod builder {
15541554
{
15551555
self.bar = value
15561556
.try_into()
1557-
.map_err(|e| format!("error converting supplied value for bar: {}", e));
1557+
.map_err(|e| format!("error converting supplied value for bar: {e}"));
15581558
self
15591559
}
15601560
}
@@ -1591,7 +1591,7 @@ pub mod builder {
15911591
{
15921592
self.this = value
15931593
.try_into()
1594-
.map_err(|e| format!("error converting supplied value for this: {}", e));
1594+
.map_err(|e| format!("error converting supplied value for this: {e}"));
15951595
self
15961596
}
15971597
}
@@ -1631,7 +1631,7 @@ pub mod builder {
16311631
{
16321632
self.x = value
16331633
.try_into()
1634-
.map_err(|e| format!("error converting supplied value for x: {}", e));
1634+
.map_err(|e| format!("error converting supplied value for x: {e}"));
16351635
self
16361636
}
16371637
pub fn y<T>(mut self, value: T) -> Self
@@ -1641,7 +1641,7 @@ pub mod builder {
16411641
{
16421642
self.y = value
16431643
.try_into()
1644-
.map_err(|e| format!("error converting supplied value for y: {}", e));
1644+
.map_err(|e| format!("error converting supplied value for y: {e}"));
16451645
self
16461646
}
16471647
}
@@ -1686,7 +1686,7 @@ pub mod builder {
16861686
{
16871687
self.result = value
16881688
.try_into()
1689-
.map_err(|e| format!("error converting supplied value for result: {}", e));
1689+
.map_err(|e| format!("error converting supplied value for result: {e}"));
16901690
self
16911691
}
16921692
}
@@ -1728,7 +1728,7 @@ pub mod builder {
17281728
{
17291729
self.msg = value
17301730
.try_into()
1731-
.map_err(|e| format!("error converting supplied value for msg: {}", e));
1731+
.map_err(|e| format!("error converting supplied value for msg: {e}"));
17321732
self
17331733
}
17341734
pub fn result<T>(mut self, value: T) -> Self
@@ -1738,7 +1738,7 @@ pub mod builder {
17381738
{
17391739
self.result = value
17401740
.try_into()
1741-
.map_err(|e| format!("error converting supplied value for result: {}", e));
1741+
.map_err(|e| format!("error converting supplied value for result: {e}"));
17421742
self
17431743
}
17441744
}
@@ -1782,7 +1782,7 @@ pub mod builder {
17821782
{
17831783
self.msg = value
17841784
.try_into()
1785-
.map_err(|e| format!("error converting supplied value for msg: {}", e));
1785+
.map_err(|e| format!("error converting supplied value for msg: {e}"));
17861786
self
17871787
}
17881788
pub fn result<T>(mut self, value: T) -> Self
@@ -1792,7 +1792,7 @@ pub mod builder {
17921792
{
17931793
self.result = value
17941794
.try_into()
1795-
.map_err(|e| format!("error converting supplied value for result: {}", e));
1795+
.map_err(|e| format!("error converting supplied value for result: {e}"));
17961796
self
17971797
}
17981798
}
@@ -1860,7 +1860,7 @@ pub mod builder {
18601860
{
18611861
self.bar = value
18621862
.try_into()
1863-
.map_err(|e| format!("error converting supplied value for bar: {}", e));
1863+
.map_err(|e| format!("error converting supplied value for bar: {e}"));
18641864
self
18651865
}
18661866
pub fn baz<T>(mut self, value: T) -> Self
@@ -1870,7 +1870,7 @@ pub mod builder {
18701870
{
18711871
self.baz = value
18721872
.try_into()
1873-
.map_err(|e| format!("error converting supplied value for baz: {}", e));
1873+
.map_err(|e| format!("error converting supplied value for baz: {e}"));
18741874
self
18751875
}
18761876
}
@@ -1912,7 +1912,7 @@ pub mod builder {
19121912
{
19131913
self.suspended_by = value
19141914
.try_into()
1915-
.map_err(|e| format!("error converting supplied value for suspended_by: {}", e));
1915+
.map_err(|e| format!("error converting supplied value for suspended_by: {e}"));
19161916
self
19171917
}
19181918
}
@@ -1955,7 +1955,7 @@ pub mod builder {
19551955
{
19561956
self.suspended_by = value
19571957
.try_into()
1958-
.map_err(|e| format!("error converting supplied value for suspended_by: {}", e));
1958+
.map_err(|e| format!("error converting supplied value for suspended_by: {e}"));
19591959
self
19601960
}
19611961
}
@@ -1998,7 +1998,7 @@ pub mod builder {
19981998
{
19991999
self.email = value
20002000
.try_into()
2001-
.map_err(|e| format!("error converting supplied value for email: {}", e));
2001+
.map_err(|e| format!("error converting supplied value for email: {e}"));
20022002
self
20032003
}
20042004
}
@@ -2041,7 +2041,7 @@ pub mod builder {
20412041
{
20422042
self.email = value
20432043
.try_into()
2044-
.map_err(|e| format!("error converting supplied value for email: {}", e));
2044+
.map_err(|e| format!("error converting supplied value for email: {e}"));
20452045
self
20462046
}
20472047
}
@@ -2081,7 +2081,7 @@ pub mod builder {
20812081
{
20822082
self.a = value
20832083
.try_into()
2084-
.map_err(|e| format!("error converting supplied value for a: {}", e));
2084+
.map_err(|e| format!("error converting supplied value for a: {e}"));
20852085
self
20862086
}
20872087
}
@@ -2115,7 +2115,7 @@ pub mod builder {
21152115
{
21162116
self.tag = value
21172117
.try_into()
2118-
.map_err(|e| format!("error converting supplied value for tag: {}", e));
2118+
.map_err(|e| format!("error converting supplied value for tag: {e}"));
21192119
self
21202120
}
21212121
}
@@ -2154,7 +2154,7 @@ pub mod builder {
21542154
{
21552155
self.action = value
21562156
.try_into()
2157-
.map_err(|e| format!("error converting supplied value for action: {}", e));
2157+
.map_err(|e| format!("error converting supplied value for action: {e}"));
21582158
self
21592159
}
21602160
}

‎typify/tests/schemas/more_types.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ pub mod builder {
212212
{
213213
self.foo = value
214214
.try_into()
215-
.map_err(|e| format!("error converting supplied value for foo: {}", e));
215+
.map_err(|e| format!("error converting supplied value for foo: {e}"));
216216
self
217217
}
218218
}
@@ -248,7 +248,7 @@ pub mod builder {
248248
{
249249
self.foo = value
250250
.try_into()
251-
.map_err(|e| format!("error converting supplied value for foo: {}", e));
251+
.map_err(|e| format!("error converting supplied value for foo: {e}"));
252252
self
253253
}
254254
}
@@ -289,7 +289,7 @@ pub mod builder {
289289
{
290290
self.foo = value
291291
.try_into()
292-
.map_err(|e| format!("error converting supplied value for foo: {}", e));
292+
.map_err(|e| format!("error converting supplied value for foo: {e}"));
293293
self
294294
}
295295
pub fn extra<T>(mut self, value: T) -> Self
@@ -301,7 +301,7 @@ pub mod builder {
301301
{
302302
self.extra = value
303303
.try_into()
304-
.map_err(|e| format!("error converting supplied value for extra: {}", e));
304+
.map_err(|e| format!("error converting supplied value for extra: {e}"));
305305
self
306306
}
307307
}
@@ -348,7 +348,7 @@ pub mod builder {
348348
{
349349
self.foo = value
350350
.try_into()
351-
.map_err(|e| format!("error converting supplied value for foo: {}", e));
351+
.map_err(|e| format!("error converting supplied value for foo: {e}"));
352352
self
353353
}
354354
pub fn extra<T>(mut self, value: T) -> Self
@@ -360,7 +360,7 @@ pub mod builder {
360360
{
361361
self.extra = value
362362
.try_into()
363-
.map_err(|e| format!("error converting supplied value for extra: {}", e));
363+
.map_err(|e| format!("error converting supplied value for extra: {e}"));
364364
self
365365
}
366366
}
@@ -402,7 +402,7 @@ pub mod builder {
402402
{
403403
self.foo = value
404404
.try_into()
405-
.map_err(|e| format!("error converting supplied value for foo: {}", e));
405+
.map_err(|e| format!("error converting supplied value for foo: {e}"));
406406
self
407407
}
408408
}

‎typify/tests/schemas/noisy-types.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ pub mod builder {
202202
{
203203
self.ok = value
204204
.try_into()
205-
.map_err(|e| format!("error converting supplied value for ok: {}", e));
205+
.map_err(|e| format!("error converting supplied value for ok: {e}"));
206206
self
207207
}
208208
}

0 commit comments

Comments
 (0)